Conflicts:
	doc/man/man1/squeue.1
	src/common/slurm_protocol_defs.c