Two problems found at NCI - we called a function that used the full pbs timeout in a retry loop; instead the function that is retried now waits for timeout / number of retries so that the moms can't get jammed for hours. Also, make sure that DIS_reply_read() isn't called infinitely, even on retry-able errors. Add a max and make sure errno is cleared before calling.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev