Fix formatting problem in salloc,sbatch and srun man pages
Merge branch 'slurm-2.5'