4.2.0

Merge routing queue no longer routing fix.
Fix for deadlock due to the reroute_job_mutex no being used in the right order. 
Other fixes