Correct CPU ID on Power7

Correct logic to support Power7 processor with 1 or 2 threads per core
(CPU IDs are not consecutive).
bug 891
Merge branch 'slurm-2.6' into slurm-14.03