Fix errors caused by DD4Hep future upgrades refactorFix morst errors by adding new geometry

This merge request fixes the errors caused by Detector!428 (merged). This is mostly done by replacing all instances of trunk with run3/trunk and equivalent.

This merge request is part of the larger 'detector refactoring for future simulation' task, and these set of merge requests are expected to come in together. See LHCb!4283 (merged) for which merge requests come together in the stack.