Documentation updates.
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11

Conflicts:
	doc/man/man1/scontrol.1
Merge remote-tracking branch 'origin/slurm-14.11'