TRQ-2759. Fix a problem with cput getting cut off.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev