Adapt to new policy in Gaudi MergeXYZ special targets names

Marco Clemencicrequested to merge
adapt-to-change-in-gaudi into run2-patches

This fixes the build failure caused by gaudi/Gaudi!1308 (merged)

Goes with Brunel!1200 (merged) and Alignment!246 (merged)

See also Bender!220 (merged)

Edited by Rosen Matev

Merge request reports