Merge remote-tracking branch 'upstream/master' into ATR_21882_topo_excl

...naPoolMultiTest/share/AthenaPoolMultiTestEventNoSplit.ref

...henaPoolMultiTest/share/AthenaPoolMultiTestEventSplit.ref

...MultiTest/share/AthenaPoolMultiTestEventSplitDecision.ref

...thenaPoolMultiTest/share/AthenaPoolMultiTestPropagate.ref

...tabaseTest/AthenaPoolMultiTest/share/SplittableData_jo.py

Build/AtlasBuildScripts/gitlab_merge.sh

...loCondBlobObjs/CaloCondBlobObjs/ATLAS_CHECK_THREAD_SAFETY

...eter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobBase.h

...meter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobDat.h

...meter/CaloCondBlobObjs/CaloCondBlobObjs/CaloCondBlobFlt.h

Calorimeter/CaloCondBlobObjs/src/CaloCondBlobBase.cxx

Calorimeter/CaloCondBlobObjs/src/CaloCondBlobFlt.cxx

Calorimeter/CaloCondBlobObjs/test/CaloCondBlobBase_test.cxx

...rimeter/CaloConditions/CaloConditions/CaloLocalHadCoeff.h

Calorimeter/CaloConditions/CaloConditions/ToolConstants.h

Calorimeter/CaloConditions/src/ToolConstants.cxx

Calorimeter/CaloInterface/CaloInterface/IToolWithConstants.h

Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx

.../CaloTrackingGeometry/src/CaloTrackingGeometryBuilder.cxx

...oTrackingGeometry/src/CaloTrackingGeometryBuilderCond.cxx