Merge branch 'master-ITkConfig' into 'master'

...rDescription/GeoModel/AtlasGeoModel/python/ITkGMConfig.py

DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py

...escription/GeoModel/AtlasGeoModel/python/InDetGMConfig.py

...on/IdDictParser/data/IdDictLArCalorimeter_HGTD_TDR_01.xml

...InDetDetDescr/PixelGeoModel/python/PixelGeoModelConfig.py

...etDetDescr/PixelGeoModel/python/PixelGeoModelOldConfig.py

...r/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfig.py

...ReadoutGeometry/SCT_ReadoutGeometry/SCT_DetectorManager.h

...tDetDescr/SCT_ReadoutGeometry/src/SCT_DetectorManager.cxx

InnerDetector/InDetDetDescr/StripGeoModelXml/CMakeLists.txt

...scr/StripGeoModelXml/StripGeoModelXml/StripGmxInterface.h

...DetDescr/StripGeoModelXml/StripGeoModelXml/StripOptions.h

...etDescr/StripGeoModelXml/python/ITkStripGeoModelConfig.py

...DetDetDescr/StripGeoModelXml/src/StripDetectorFactory.cxx

.../InDetDetDescr/StripGeoModelXml/src/StripDetectorTool.cxx

.../InDetDetDescr/StripGeoModelXml/src/StripGmxInterface.cxx

...4Atlas/G4AtlasServices/python/G4AtlasServicesConfigNew.py

...ation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py

...n/G4Atlas/G4AtlasTools/python/G4PhysicsRegionConfigNew.py