Solve merge conflicts and use smart ptrs

...dChannelTool/CaloBadChannelTool/ATLAS_CHECK_THREAD_SAFETY

Calorimeter/CaloCondPhysAlgs/CMakeLists.txt

...loCondPhysAlgs/CaloCondPhysAlgs/ATLAS_CHECK_THREAD_SAFETY

Calorimeter/CaloCondPhysAlgs/CaloCondPhysAlgs/LArHVMapTool.h

Calorimeter/CaloCondPhysAlgs/src/CaloAddCellPedShift.h

Calorimeter/CaloCondPhysAlgs/src/CaloCellCalcEnergyCorr.h

Calorimeter/CaloCondPhysAlgs/src/CaloCellEnergyCorr2Ntuple.h

Calorimeter/CaloCondPhysAlgs/src/CaloCellNoiseAlg.h

Calorimeter/CaloCondPhysAlgs/src/CaloCellPosition2Ntuple.h

Calorimeter/CaloCondPhysAlgs/src/FCAL_HV_Energy_Rescale.h

Calorimeter/CaloDetDescr/CaloDetDescr/CaloAlignTool.h

...imeter/CaloDetDescr/CaloDetDescr/CaloSuperCellAlignTool.h

Calorimeter/CaloDetDescr/src/CaloAlignTool.cxx

Calorimeter/CaloDetDescr/src/CaloDetDescriptor.cxx

Calorimeter/CaloDetDescr/src/CaloSuperCellAlignTool.cxx

...miConditions/CaloLumiConditions/ATLAS_CHECK_THREAD_SAFETY

Control/AthContainers/AthContainers/DataVector.h

Control/AthContainers/AthContainers/DataVector.icc

Control/AthContainers/AthContainers/tools/ElementProxy.h

Control/AthLinks/AthLinks/ElementLinkVector.h