Merge fix for trq-1736 - pbs server crash.
Merge branch 'master' of https://github.com/adaptivecomputing/torque