Fix issues where memory or node count of a srun job is altered while the
srun is pending.  The step creation would use the old values and possibly
hang srun since the step wouldn't be able to be created in the modified
allocation.
Remove unneeded variable.
Merge remote-tracking branch 'origin/slurm-2.6'