Changed previous fix for TRQ-1383 so qstat -r puts out the new information in the old format
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev