Fixes to enable super project build

Rosen Matevrequested to merge
rm-merge-targets into master

For testing see LHCb!3428 (merged)

Edited by Rosen Matev

Merge request reports