merge with master and resolve conflict

AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt

...bDetectorEnvelopes/SubDetectorEnvelopes/IEnvelopeDefSvc.h

Calorimeter/CaloSimEvent/CaloSimEvent/CaloCalibrationHit.h

Calorimeter/CaloSimEvent/src/CaloCalibrationHitContainer.cxx

Control/AthenaConfiguration/python/ComponentAccumulator.py

Control/AthenaMonitoring/python/BadLBFilterToolConfig.py

Control/AthenaMonitoring/python/DQMonFlags.py

Control/AthenaMonitoring/python/TriggerInterface.py

...rol/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py

Control/AthenaMonitoring/share/DataQualityInit_jobOptions.py

.../AthenaMonitoring/share/DataQualitySteering_jobOptions.py

Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py

...aQualityUtils/src/MonitoringFile_CSCChamberEfficiency.cxx

...ity/DataQualityUtils/src/MonitoringFile_CSCClusterFit.cxx

...Quality/DataQualityUtils/src/MonitoringFile_MergeAlgs.cxx

...naPOOL/AthenaPoolCnvSvc/src/AthenaRootSharedWriterSvc.cxx

Database/AthenaPOOL/AthenaPoolUtilities/doc/packagedoc.h

Database/CrestApi/CrestApi/CrestApi.h

Database/IOVDbSvc/python/CondDB.py

...oModelStandalone/DumpGeo/share/vp1FragmentFixDBReplica.py