Fix for bad merge

Correction to bad merge of slurm-2.6 in
commit 88220a2b77f1a790a0b7f2c2cf3a030c47be1ddb