Merged with upstream/master

...er/CaloAlignment/CaloAlignmentAlgs/src/CaloAlignCondAlg.h

...nment/CaloAlignmentAlgs/src/CaloSuperCellAlignCondAlg.cxx

...ignment/CaloAlignmentAlgs/src/CaloSuperCellAlignCondAlg.h

...lignmentAlgs/src/components/CaloAlignmentAlgs_entries.cxx

Calorimeter/CaloAlignment/CaloAlignmentTools/CMakeLists.txt

...er/CaloAlignment/CaloAlignmentTools/src/CaloAlignTool.cxx

...eter/CaloAlignment/CaloAlignmentTools/src/CaloAlignTool.h

...ignment/CaloAlignmentTools/src/CaloSuperCellAlignTool.cxx

...Alignment/CaloAlignmentTools/src/CaloSuperCellAlignTool.h

...gnmentTools/src/components/CaloAlignmentTools_entries.cxx

...meter/CaloClusterCorrection/test/CaloScaleCluster_test.py

...CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.cxx

...v/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.h

Calorimeter/CaloDetDescr/CaloDetDescr/CaloDepthTool.h

Calorimeter/CaloDetDescr/CaloDetDescr/CaloDetDescrDict.h

Calorimeter/CaloDetDescr/CaloDetDescr/CaloDetDescrManager.h

Calorimeter/CaloDetDescr/CaloDetDescr/selection.xml

Calorimeter/CaloDetDescr/src/CaloDepthTool.cxx

...eter/CaloDetDescr/src/components/CaloDetDescr_entries.cxx

.../CaloDetDescrUtils/CaloDetDescrUtils/CaloSuperCellUtils.h