Merge branch mguth-ci-docker with refs/heads/master into refs/merge-requests/571/train

51 jobs for !571 with mguth-ci-docker into master in 16 minutes and 39 seconds (queued for 2 seconds)
merge train