Merge branch mguth-preprocess-configs-cleanup with refs/heads/master into...

Merge branch mguth-preprocess-configs-cleanup with refs/heads/master into refs/merge-requests/609/train
52 jobs for !609 with mguth-preprocess-configs-cleanup into master in 10 minutes and 58 seconds (queued for 5 seconds)
merge train