Sweeping !56961 from master to 22.0. AthenaBaseComps: Fix thread-safety checker warnings.

Atlas Nightlybuildrequested to merge
cherry-pick-da6dceefaa8-22.0 into 22.0

AthenaBaseComps: Fix thread-safety checker warnings.

See merge request !56961 (merged)

Merge request reports