Fix warning with gcc 4.8
Merge remote-tracking branch 'origin/slurm-2.6'