master
Attempt to make 2017 scenario compatible with dd4hep
Also propagates the overlap fix outside of cmsExtendedGeometry2021XML scenario (more consistent, and safe since it is an infenitesimal reduction anyway).