Fix a couple of "make check" issues

There was some logic copied from bitstring.c and an unused variable
problem reported by the compiler.
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
Merge branch 'slurm-14.03'