Merged fix from the 4.1-dev branch for Jira Ticket TRQ-897: Job rejecting jobs because of resources_max.nodes when it shouldn't.