Help the cherry-pick for TRQ-2377.
Merge branch '4.5-dev' of https://github.com/adaptivecomputing/torque into 4.5-dev