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