jobacct_gather - Revert bad calculation from previous commit
Merge remote-tracking branch 'origin/slurm-2.5'