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

AtlasTest/TestTools/CMakeLists.txt

AtlasTest/TestTools/share/post.sh

AtlasTest/TestTools/share/postsh_ignore_new_test.ref

AtlasTest/TestTools/share/postsh_select_ignore_test.ref

AtlasTest/TestTools/share/postsh_select_new_test.ref

AtlasTest/TestTools/share/postsh_select_test.ref

...rimeter/CaloClusterCorrection/python/CaloSwCorrections.py

Calorimeter/CaloClusterCorrection/python/CaloSwLayers.py

Calorimeter/CaloClusterCorrection/python/MakeHierTags.py

Calorimeter/CaloClusterCorrection/python/common.py

Calorimeter/CaloClusterCorrection/python/linkDummyTags.py

Calorimeter/CaloClusterCorrection/python/scrubMagicTags.py

...rimeter/CaloConditions/share/CaloConditions_jobOptions.py

Calorimeter/CaloRec/CMakeLists.txt

...rimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py

Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py

...rimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py

Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py

...imeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py

...rimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py