Merge branch mguth-imagebuild-mrs with refs/heads/master into refs/merge-requests/338/train

34 jobs for !338 with mguth-imagebuild-mrs into master in 17 minutes and 32 seconds (queued for 3 seconds)
merge train