Merge branch 'master' of https://github.com/SchedMD/slurm

Conflicts:
	src/plugins/select/cons_res/select_cons_res.c
	src/slurmctld/reservation.c
	testsuite/expect/inc3.11.1
	testsuite/expect/inc3.11.7
	testsuite/expect/inc3.11.8
	testsuite/expect/test3.11