Describe how to add nodes to slurm.conf in FAQ
Update maximum line length in slurm configuration file documentation
Merge branch 'slurm-2.5'