Fix race in cleanupthread

Jørgen Lind requested to merge feature/jorgen.lind/cleanupthread_deadlock_fix into master Aug 17, 2020