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

Merge branch feature/jorgen.lind/TEST_AWS_FIXUP with refs/heads/master into refs/merge-requests/120/train
3 jobs for !120 with feature/jorgen.lind/TEST_AWS_FIXUP into master in 2 minutes and 50 seconds (queued for 1 second)
merge train