Correct core reservation logic for use with select/serial plugin.
Merge branch 'slurm-2.5'