Merge from 4.1-dev for TRQ-1658: Multinode job stuck in "EXITING" state.