Sync sinfo output format descriptions with sinfo.c
Merge branch 'slurm-14.03'