Merge branch 'slurm-2.4'

Conflicts:
	src/common/slurm_accounting_storage.c
	src/common/slurm_auth.c
	src/common/slurm_jobacct_gather.c
	src/common/slurm_priority.c
	src/common/slurm_topology.c
	src/slurmctld/sched_plugin.c