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

Merge branch feature/jorgen.lind/upgrade_aws with refs/heads/master into refs/merge-requests/429/train
3 jobs for !429 with feature/jorgen.lind/upgrade_aws into master in 29 minutes and 8 seconds (queued for 1 second)
merge train