Backward compatible changes to be able to build with Gaudi v40

See LHCb!5179 (merged) for a detailed description.

I also included a fix for a tiny regression introduced in !4744 (merged).