Sweeping !55079 from master to 22.0. AthenaServices: Work around conditions dependency issues.
AthenaServices: Work around conditions dependency issues.
See merge request !55079 (merged)
AthenaServices: Work around conditions dependency issues.
See merge request !55079 (merged)