Merged from the 4.1-dev branch - trq-1484 - pbsdsh line of code with better logging.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev