Merge branch feature/jorgen.lind/enpointOverrideAWS with refs/heads/master...

Merge branch feature/jorgen.lind/enpointOverrideAWS with refs/heads/master into refs/merge-requests/117/train
3 jobs for !117 with feature/jorgen.lind/enpointOverrideAWS into master in 4 minutes and 32 seconds
merge train