Merge branch...

Merge branch feature/morten.ofstad/MinorChangesToErrorHandlingAndVolumeDataAccessManagerRefCounting with refs/heads/master into refs/merge-requests/380/train
3 jobs for !380 with feature/morten.ofstad/MinorChangesToErrorHandlingAndVolumeDataAccessManagerRefCounting into master in 20 minutes and 49 seconds (queued for 2 seconds)
merge train