Merge remote-tracking branch 'upstream/master' into master-dijetmatcher-2

AtlasTest/DatabaseTest/AthenaPoolMultiTest/CMakeLists.txt

...thenaPoolMultiTest/share/AthenaPoolMultiTestPropagate.ref

...oolMultiTest/share/AthenaPoolMultiTestPropagateSelect.ref

...Test/AthenaPoolMultiTest/share/CheckStreamPropagate_jo.py

...eTest/AthenaPoolMultiTest/share/DecisionPropagation_jo.py

...st/DatabaseTest/AthenaPoolMultiTest/test/post_check_es.sh

...est/DatabaseTest/AthenaPoolMultiTest/test/post_check_p.sh

Calorimeter/CaloCalibHitRec/CMakeLists.txt

...eter/CaloCalibHitRec/CaloCalibHitRec/CalibHitToCaloCell.h

...alibHitRec/CaloCalibHitRec/CaloCalibClusterMomentsMaker.h

...libHitRec/CaloCalibHitRec/CaloCalibClusterMomentsMaker2.h

Calorimeter/CaloCalibHitRec/CaloCalibHitRec/CaloDmEnergy.h

...imeter/CaloCalibHitRec/CaloCalibHitRec/CaloDmNeighbours.h

Calorimeter/CaloCalibHitRec/src/CalibHitToCaloCell.cxx

...eter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker.cxx

...ter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx

Calorimeter/CaloCalibHitRec/src/CaloDmEnergy.cxx

Calorimeter/CaloCalibHitRec/src/CaloDmNeighbours.cxx

...r/CaloCellCorrection/src/CaloCellNeighborsAverageCorr.cxx

...ter/CaloCellCorrection/src/CaloCellNeighborsAverageCorr.h