Merge branch feature/marius.storm-olsen/AWS_SDMS_temporary_support with...

Merge branch feature/marius.storm-olsen/AWS_SDMS_temporary_support with refs/heads/master into refs/merge-requests/359/train
3 jobs for !359 with feature/marius.storm-olsen/AWS_SDMS_temporary_support into master in 21 minutes and 30 seconds (queued for 2 seconds)
merge train