Conflicts:
	src/slurmctld/reservation.c

cpu count.

"operator" will break the build.  So renaming it makes things work
correctly.

Original logic lacked check for NULL list pointer

The previous logic could deadlock with the log functions pthead_atfork()
functions depending upon the call order.

Apply the limit to SPANK plugins.
Avoid invalid memory reference is slurmdbd calls slurm_get_prolog_timeout()
Updates to commit 659ae598

There were many calls to slurm_list_iterator_create() without the
matching slurm_list_iterator_destroy(), which would result in
memory leaks.

cancelling job ID that could not be found was treated like an error
when it should just return success.

Add re-entrant versions of glibc time functions (e.g. localtime) to Slurm
in order to eliminate rare deadlock of slurmstepd fork and exec calls.
bug 1638

14.11 worked fine, but there were changes in 15.08 that weren't addressed
in the original patch.

utilization.

random crashing in db2 when the slurmctld is exiting.

Signed-off-by: Danny Auble <da@schedmd.com>