Merge fix to broken unit tests from the 4.2-dev branch.
Merge branch '4.1-dev' of https://github.com/adaptivecomputing/torque into 4.1-dev