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

Conflicts:
	src/common/Makefile.in
	src/common/mpi.c
	src/common/node_select.c
	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/common/switch.c
	src/slurmctld/job_submit.c
	src/slurmctld/sched_plugin.c