Corrections to job priority calculation

This fixes another error in job priority calculations
Merge branch 'slurm-2.6'