Do not let srun overwrite SLURM_JOB_NUM_NODES if already in an allocation.
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11
Merge remote-tracking branch 'origin/slurm-14.11'