Protocol compatibility fix.
Merge remote branch 'origin/slurm-2.6'