Sweeping !55079 from master to 22.0. AthenaServices: Work around conditions dependency issues.

Atlas Nightlybuildrequested to merge
cherry-pick-915f7edc54e-22.0 into 22.0

AthenaServices: Work around conditions dependency issues.

See merge request !55079 (merged)

Merge request reports