Merge branch feature/morten.ofstad/MoveAccessModeDefinition with...

Merge branch feature/morten.ofstad/MoveAccessModeDefinition with refs/heads/master into refs/merge-requests/385/train
3 jobs for !385 with feature/morten.ofstad/MoveAccessModeDefinition into master in 21 minutes and 43 seconds (queued for 2 seconds)
merge train