trq-2188 backed out timeout.
Merge branch '4.5.0' of https://github.com/adaptivecomputing/torque into 4.5.0