Minor change in log message wording
Fix to reserving all nodes in partition

Previous logic would try to pick a specific node count and on a
heterogeneous system, this would cause a problem. This change
largely reverts commit a270417b0b580da5edbe0b6a452eb421471b1c29
Remove vestigial variable
Merge branch 'slurm-2.6'