Eliminate configuration file 4096 character line limitation
Remove redundant variable from previous patch
Merge branch 'slurm-2.5'