Check in something to speed up the unit tests on jenkins a little and fix a unit test issue.
Merge branch 'master' of https://github.com/adaptivecomputing/torque