Merge remote-tracking branch 'origin/slurm-14.11'

Conflicts:
	contribs/README
	doc/html/crypto_plugins.shtml
	doc/html/plugins.shtml
	doc/html/preempt.shtml
	doc/html/preemption_plugins.shtml
	doc/html/priority_plugins.shtml
	doc/html/topology_plugin.shtml
	doc/man/man1/sbatch.1
	doc/man/man3/slurm_allocate_resources.3
	doc/man/man5/slurm.conf.5