srun memory option fix

srun command line of either --mem or --mem-per-cpu will override both the
SLURM_MEM_PER_CPU and SLURM_MEM_PER_NODE environment variables.
Without this change, salloc or sbatch setting --mem-per-cpu (or a
configuration of DefMemPerCPU) would over-ride the step's --mem
value.