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