merge with master and fix conflicts -- but CaloTopoClusterConfig still broken

Calorimeter/CaloRec/python/CaloTopoClusterConfig.py

Calorimeter/CaloTools/python/CaloNoiseToolConfig.py

Control/AthenaConfiguration/python/AllConfigFlags.py

Control/AthenaConfiguration/python/MainServicesConfig.py

Control/CxxUtils/test/CachedUniquePtr_test.cxx

Generators/GeneratorObjects/src/HepMcParticleLink.cxx

...ors/GeneratorObjectsTPCnv/src/HepMcParticleLinkCnv_p1.cxx

...tor/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibEventInfo.h

...tector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibLbTool.h

...tMonitoring/SCT_Monitoring/SCT_Monitoring/SCTErrMonTool.h

...nitoring/SCT_Monitoring/SCT_Monitoring/SCTHitEffMonTool.h

...itoring/SCT_Monitoring/SCT_Monitoring/SCTLorentzMonTool.h

...ring/SCT_Monitoring/SCT_Monitoring/SCTMotherTrigMonTool.h

...ring/SCT_Monitoring/SCT_Monitoring/SCTRatioNoiseMonTool.h

...itoring/SCT_Monitoring/SCT_Monitoring/SCTSummaryMonTool.h

...nitoring/SCT_Monitoring/SCT_Monitoring/SCTTracksMonTool.h

...itoring/SCT_Monitoring/SCT_Monitoring/SCT_ClusterStruct.h

...ctor/InDetMonitoring/SCT_Monitoring/src/SCTErrMonTool.cxx

...r/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx

...nDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonTool.cxx