Fix regression in 06b41cdcb07a7c50a4030d4b2df9f8c24e99ab99 that would
throw away initialized variable.
Fix typos
Merge remote-tracking branch 'origin/slurm-2.6'