scontrol show job - Correct NumNodes value

It has been changed to improve the calculated value for pending
jobs and use the actual node count value for jobs that have been
started (including suspended, completed, etc.)
bug 549
Merge branch 'slurm-2.6'