Priority/multifactor - Avoid underflow in half-life calculation.
Change comparison to avoid redundant variable reset
Merge branch 'slurm-2.5'

Conflicts:
	config.h.in