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

Calorimeter/CaloDetDescr/CaloDetDescr/CaloDetDescrManager.h

Calorimeter/CaloDetDescr/src/CaloDetDescrManager.cxx

Calorimeter/CaloDetDescr/src/CaloSuperCellAlignTool.cxx

Calorimeter/CaloLocalHadCalib/src/GetLCClassification.cxx

Calorimeter/CaloLocalHadCalib/src/GetLCDeadMaterial.cxx

Calorimeter/CaloLocalHadCalib/src/GetLCDeadMaterialTree.cxx

Calorimeter/CaloLocalHadCalib/src/GetLCOutOfCluster.cxx

Calorimeter/CaloLocalHadCalib/src/GetLCSinglePionsPerf.cxx

Calorimeter/CaloLocalHadCalib/src/GetLCWeights.cxx

Calorimeter/CaloMonitoring/src/CaloTowerVecMon.cxx

Calorimeter/CaloUtils/src/LocalNoiseSuppressionTool.cxx

Commission/CommissionUtils/src/CosmicTriggerTimeTool.cxx

Control/AthAllocators/share/DataPool_test.ref

Control/AthContainers/AthContainers/tools/DVLDataBucket.h

Control/AthContainers/AthContainers/tools/DVLDataBucket.icc

Control/AthContainers/AthContainers/tools/DVLEltBaseInfo.icc

Control/AthToolSupport/AsgTools/AsgTools/Check.h

Control/AthenaBaseComps/AthenaBaseComps/AthAlgTool.h

Control/AthenaBaseComps/AthenaBaseComps/AthAlgorithm.h

...l/AthenaBaseComps/AthenaBaseComps/AthReentrantAlgorithm.h