Merge branch feature/jorgen.lind/cleanupthread_deadlock_fix with...

Merge branch feature/jorgen.lind/cleanupthread_deadlock_fix with refs/heads/master into refs/merge-requests/209/train
3 jobs for !209 with feature/jorgen.lind/cleanupthread_deadlock_fix into master in 5 minutes and 13 seconds
merge train