Merged changes from the 4.1-dev for TRQ-1595: Not able to submit jobs when XT is down.