Conflicts:
	src/slurmctld/reservation.c
	testsuite/expect/test3.11

Updates of existing bluegene advanced reservations did not work at all.
Some multi-core configurations resulting in an abort due to creating
  core_bitmaps for the reservation that only had one bit per node rather
  than one bit per core.
These bugs were introduced in commit 5f258072

Layouts packed representation adds trailing '\n' to each string.
Ensure that layout names, when packed for an info RPC also bring
their own '\n', thus avoiding to add when printing the result.

the introduction of the record count in the buffer returned while packing
layouts introduced a regression in the state saving logic. The state dump
logic was based on an iteration over the packed strings, stopping at the
first invalid string found, thus nothing was dumped because. This commit
start by extracting the record count before iterating on the packed
strings.

job data structure.

Conflicts:
	contribs/README
	doc/html/crypto_plugins.shtml
	doc/html/plugins.shtml
	doc/html/preempt.shtml
	doc/html/preemption_plugins.shtml
	doc/html/priority_plugins.shtml
	doc/html/topology_plugin.shtml
	doc/man/man1/sbatch.1
	doc/man/man3/slurm_allocate_resources.3
	doc/man/man5/slurm.conf.5

Logic was assuming the reservation had a node bitmap which was
  being used to check for overlapping jobs. If there is no node
  bitmap (e.g. a licenses only reservation), an abort would result.

Bug 1739

Bug 1743

Bug 1743

Prevent double free.

cpufreq variables weren't being intialized to NO_VAL when using task/none
plugin. This caused the conditions in cpur_freq_reset to not stop
test_cpu_owner_lock from being called.

Conflicts:
	src/common/cpu_frequency.c

Conflicts:
	src/common/cpu_frequency.c