Conflicts:
	src/plugins/task/cgroup/task_cgroup_devices.c

commits dealing with the new multifactor flag.

different approach in Tree Based (Fair tree).

batch_4294967294.

modified.

to allow sview to display blocks correctly.

to avoid overlapping erroneously.

Before you could get overlapping reservations if you asked for a core
based reservation and then a whole node reservation.  This fixes that.

This reverts commit 1b65f613.

display the path.  It turns out in Windows you can't even make a file that
has \/:*?<>| in it.  Who knew?

slurm.conf file.

describing the error code.

Conflicts:
	META

Conflicts:
	src/slurmctld/job_mgr.c
	testsuite/expect/test1.97

Test 3.11 was failing in some configurations without this as
the CPU count in the RPC was lower than the number of nodes in
the required node list