Fixed sh5util to print its usage.
Correctec commit f9a3c7e4e8ec.
Merge remote-tracking branch 'origin/slurm-2.6'

Conflicts:
	contribs/pmi2/pmi2_api.c