Cray - Disable enforcement of MaxTasksPerNode

This is not applicable with launch/aprun
Merge branch 'slurm-2.5'