changes required for gaudi/Gaudi!1249

Gerhard Ravenrequested to merge
for-gaudi-1249 into master

Changes to make code forward compatible with gaudi/Gaudi!1249 (merged). Can be applied independent of gaudi/Gaudi!1249 (merged)

Edited by Gerhard Raven

Merge request reports