Merge branch 'feature/jorgen.lind/2.1.1' into '2.1'

DMS upgrade and general fixup

See merge request !427
4 jobs for !427 with feature/jorgen.lind/2.1.1 into 2.1 in 4 minutes and 19 seconds (queued for 2 seconds)
latest
Status Name Job ID Coverage
  Prepare
passed devel-container-merge-request #398881
docker-runner

00:01:18

 
  Build
failed compile-merge-request #398979
docker-runner

00:03:00

failed compile-merge-request #398882
docker-runner

00:02:51

 
  Test
skipped unit-tests #398883
docker-runner
 
Name Stage Failure
failed
compile-merge-request Build
cache hit rate                     42.46 %
called for link 12
called for preprocessing 6
preprocessor error 1
cleanups performed 0
files in cache 1343
cache size 154.5 MB
max cache size 5.0 GB
ERROR: Job failed: exit code 1