Merge branch feature/jorgen.lind/update_2.1_rh_build_fix with refs/heads/2.1...

Merge branch feature/jorgen.lind/update_2.1_rh_build_fix with refs/heads/2.1 into refs/merge-requests/504/train
3 jobs for !504 with feature/jorgen.lind/update_2.1_rh_build_fix into 2.1 in 24 minutes and 51 seconds (queued for 9 seconds)
merge train