Conflicts:
	src/slurmctld/proc_req.c

Needed due to part_filter_set() calls; without write lock this can race
returning inconsistent results to 'sinfo'.

Bug 2958.

Regression test fixes if SelectTypePlugin not managing memory and no node
    memory size set (defaults to 1 MB per node).

Conflicts:
	src/common/slurm_acct_gather_profile.c

Fix race condition in the account_gather plugin that could result in job
    stuck in COMPLETING state.
bug 2973

These problems have been around for a while, but coverity just started
  to report them for some reason.

Prior logic used to create an advanced reservation based upon a core
  count would ignore the specialized cores. Then when a job tried to
  use the reservation, it would consider the specialized cores and
  not be able to use the core count used in the reservation creation.
  This change considers specialized cores when creating the reservation.

There was a line removed that should not have been

Move the function that identifies specialized cores from static
  to extern for future use by advanced reservation logic.

If there are a huge number of jobs, the previous logic could keep
  the slurmctld daemon busy with locks set for several seconds.
bug 2719

Bring in federation read/write locks

Conflicts:
	src/slurmd/slurmstepd/slurmstepd.c

Problem introduced in commit 03cf4a5d

If slurmstepd had been swapped out before upgrade happened it could
  easily lead to SIGBUS at any time after upgrade. Prevent that by
  mlocking it.
bug 2334

xcgroup_delete will print a log message if there is a problem.

# Conflicts:
#	NEWS

SLURM_JOB_RESERVAION environment variables are set for the salloc command.
Document the same environment variables for the salloc, sbatch and srun
commands in their man pages.

Also we are making extern lower case in the api to match this and sacct.

Bugs 2681 and 2703

that had a partition in them.

Add support for setting the SLURM_JOB_ACCOUNT, SLURM_JOB_QOS and
    SLURM_JOB_RESERVAION environment variables are set for the srun command.
    Document the same environment variables for the salloc, sbatch and srun
    commands in their man pages.
bug 2945

Document that the SLURM_JOB_ACCOUNT and SLURM_JOB_QOS environment variables
    are set for the srun command in its man page.
bug 2945

Partially revert commit 4f8c62c1
salloc does not set SLURM_JOB_ACCOUNT or SLURM_JOB_QOS

Document that the SLURM_JOB_ACCOUNT and SLURM_JOB_QOS environment variables
    are set for the salloc and sbatch commands in their man pages.
bug 2945