Correction to cons_res web page
Merge branch 'slurm-2.6'