Fixed cherry-pick for coverity deadlock fix in master
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev
fixed a cherry-pick from master to fix a deadlock found by Coverity

Conflicts:
	src/server/queue_recycler.c