If running jobacct_gather/none fix issue on unpacking step completion.
CRAY - Fix issue with NHC if job doesn't have any nodes in it.
Merge remote-tracking branch 'origin/slurm-2.6'

Conflicts:
	src/slurmd/slurmd/slurmd.c