Fix issue with a 2.5 slurmstepd locking up when talking to a 2.6 slurmd.
Merge remote-tracking branch 'origin/slurm-2.6'

Conflicts:
	src/common/stepd_api.c