Merge branch feature/jorgen.lind/AWSkeys with refs/heads/master into refs/merge-requests/160/train

3 jobs for !160 with feature/jorgen.lind/AWSkeys into master in 4 minutes and 40 seconds (queued for 1 second)
merge train