Merge from 4.2-dev for TRQ-1838 - pbs_server is hung, deadlock.