Correct sinfo "%c" (node's CPU count) output value for Bluegene systems
Merge branch 'slurm-2.5'