task/affinity plugin - Fix bug in CPU masks for some processors
Fix bug in CPU bind logic
Remove vestigial logging
task/affinity - improve logic for Power7 without hyperthreading

Without this change, allocations less than a whole node can result
in an incorrect task binding for power7 processors
Merge branch 'slurm-2.5'