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

Conflicts:
	src/common/node_conf.c
	src/common/node_conf.h
	src/plugins/select/cons_res/select_cons_res.c
	src/plugins/select/serial/select_serial.c