Merged changes for TRQ-897: TORQUE rejecting jobs because of resources_max.nodes when it shouldn't.