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

Merge branch feature/morten.ofstad/VolumeDataStoreVDSFile with refs/heads/master into refs/merge-requests/202/train
3 jobs for !202 with feature/morten.ofstad/VolumeDataStoreVDSFile into master in 5 minutes and 27 seconds (queued for 3 seconds)
merge train