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