Merge branch feature/jorgen.lind/disable_aws with refs/heads/master into...

Merge branch feature/jorgen.lind/disable_aws with refs/heads/master into refs/merge-requests/338/train
3 jobs for !338 with feature/jorgen.lind/disable_aws into master in 18 minutes and 26 seconds (queued for 2 seconds)
merge train