TRQ-1608. Fix a deadlock due to the reroute_job_mutex not being used properly in the hierarchy. The locking order should be reroute_job_mutex, then the all_queues, then the queue.
Fixed a problem where jobs in a routing queue no longer
route if pbs_server is restarted. TRQ-1597
Merge branch '4.2.0' of https://github.com/actorquedeveloper/torque into actorquedeveloper-4.2.0

Conflicts:
	src/server/job_route.c