Fix broken unit test due to my changes for trq-2381.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev