Correct sinfo sort fields options

Correct sinfo --sort fields to match documentation: E => Reason,
H -> Reason Time (new), R -> Partition Name, u/U -> Reason user (new)
Merge branch 'slurm-2.6' into slurm-14.03

Conflicts:
	src/sinfo/sort.c