Fix logic to optimize GRES topology with respect to allocated CPUs.
Clarify documenation with respect to CPU binding
Merge branch 'slurm-2.5'