Enforce QOS MaxCPUsMin limit when job has no time limit

bug 436
Merge branch 'slurm-2.5' into slurm-2.6