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

Control/AthenaServices/test/AthenaOutputStream_test.cxx

...y/DataQualityInterfaces/DataQualityInterfaces/HanConfig.h

Event/EventPrimitives/EventPrimitives/AmgMatrixBasePlugin.h

Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.cxx

Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.h

Event/xAOD/xAODEgamma/Root/Egamma_v1.cxx

Event/xAOD/xAODEgamma/xAODEgamma/EgammaDefs.h

Event/xAOD/xAODEgamma/xAODEgamma/EgammaEnums.h

Event/xAOD/xAODEgamma/xAODEgamma/versions/Egamma_v1.h

Event/xAOD/xAODEgamma/xAODEgamma/versions/Electron_v1.h

LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref

LumiBlock/LumiCalc/CMakeLists.txt

...rfaces/MuonRecToolInterfaces/IMuonErrorOptimisationTool.h

...nRecToolInterfaces/MuonRecToolInterfaces/IMuonRefitTool.h

...ls/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx

...ools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.h

...rackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.cxx

...nTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.h

...MakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx

...ctronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx