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

...escription/DetDescrCnvSvc/DetDescrCnvSvc/DetDescrCnvSvc.h

...Description/DetDescrCnvSvc/python/DetDescrCnvSvcConfig.py

DetectorDescription/DetDescrCnvSvc/python/DetStoreConfig.py

DetectorDescription/DetDescrCnvSvc/share/DetStore.py

...orDescription/DetDescrCnvSvc/share/DetStore_joboptions.py

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx

DetectorDescription/GeoModel/AtlasGeoModel/python/MuonGM.py

...tion/GeoModel/AtlasGeoModel/python/MuonGMJobProperties.py

...IdDictParser/data/IdDictMuonSpectrometer_R.09.AsymNSW.xml

DetectorDescription/RegionSelector/python/RegSelConfig.py

...ctorDescription/RegionSelector/python/RegSelSvcDefault.py

HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT.py

...rometer/Amdcsimrec/AmdcAth/share/AmdcAth_GeometryTasks.py

...ByteStreamCnvTest/python/MuonByteStreamCnvTestConfigDb.py

.../MuonByteStreamCnvTest/share/jobOptions_MuonRDOToDigit.py

...nCnv/MuonByteStreamCnvTest/src/MuonRdoToMuonDigitTool.cxx

...ditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.cxx

...onditions/MuonCondGeneral/MuonCondSvc/src/CscCoolStrSvc.h

MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py

MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py