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

.../CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx

...rackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h

Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx

Calorimeter/CaloUtils/CMakeLists.txt

Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h

Calorimeter/CaloUtils/share/CaloTowerStore_test.ref

Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx

Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.cxx

Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h

Control/AthContainers/AthContainers/tools/copyThinned.icc

Control/AthenaServices/share/AthenaOutputStream_test.ref

Control/AthenaServices/share/AthenaOutputStream_test.txt

Control/AthenaServices/src/AthenaOutputStream.cxx

Control/AthenaServices/src/AthenaOutputStream.h

Control/AthenaServices/src/CompressionInfo.h

Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx

Control/AthenaServices/src/ThinningCacheTool.cxx

Control/AthenaServices/test/AthenaOutputStream_test.cxx

Control/AthenaServices/test/ThinningCacheTool_test.cxx

Control/CxxUtils/CxxUtils/get_unaligned.h