Fix the order of operations in checking joining jobs.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev