Revert "Merge branch 'dd4hep_future_upgrades_refactor' into 'master'"

This reverts merge request !1009 (merged) as it will be needed to finalise the release of Gauss-on-Gaussino based on Detector v1r23.

If no other MR will be needed for that this will not be merged and the tag made on previous commit.