Merge from the 4.2-dev branch for trq-1585 - slow job submission leads to pbs_server crash.