Fix issue with last patch dealing with deadlock from 2.5 slurmstepd
-> 2.6 slurmd
Merge remote-tracking branch 'origin/slurm-2.6'