Add comments to clarify logic
Merge branch 'slurm-2.5'
Update META for v2.6.0pre4