CRAY - Fix env for SLURM_MEM_PER_CPU when given MEM_PER_NODE
Merge remote-tracking branch 'origin/slurm-2.5'