Select/cons_res - Correct total CPU count allocated to a job

Effects jobs with --exclusive and --cpus-per-task options
bug 355
Merge branch 'slurm-2.5' into slurm-2.6
Merge branch 'slurm-2.6'