Merge branch 'superbuild/fix/MultipleFixes' into 'master'

[superbuild][fix][refact] Multiple fixes in superbuild

See merge request !186
9 jobs for master in 15 minutes and 18 seconds (queued for 2 seconds)