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

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