Correction for MaxCPUsPerNode logic

This is a correction to commit 308b743204e47b560535328c481521dc229e8743
Merge branch 'slurm-14.03'