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

...ryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.cxx

...etryCommon/BeamPipeGeoModel/src/BeamPipeDetectorFactory.h

...ryCommon/BeamPipeGeoModel/src/BeamPipeDetectorManager.cxx

...metryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.cxx

...eometryCommon/BeamPipeGeoModel/src/BeamPipeDetectorTool.h

...on/CavernInfraGeoModel/src/CavernInfraDetectorFactory.cxx

...mmon/CavernInfraGeoModel/src/CavernInfraDetectorFactory.h

...on/CavernInfraGeoModel/src/CavernInfraDetectorFactory01.h

...on/CavernInfraGeoModel/src/CavernInfraDetectorManager.cxx

...yCommon/CavernInfraGeoModel/src/CavernInfraDetectorTool.h

...tryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.cxx

...metryCommon/GeoModelEnvelopes/src/ForDetEnvelopeFactory.h

...tryCommon/GeoModelEnvelopes/src/ForDetEnvelopeManager.cxx

...ometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.cxx

...GeometryCommon/GeoModelEnvelopes/src/ForDetEnvelopeTool.h

Build/AtlasBuildScripts/build_Gaudi.sh

Build/AtlasBuildScripts/build_atlasexternals.sh

...libHitRec/CaloCalibHitRec/CaloCalibClusterMomentsMaker2.h

...ter/CaloCalibHitRec/src/CaloCalibClusterMomentsMaker2.cxx

...nalysisBaseComps/AthAnalysisBaseComps/AthAnalysisHelper.h