Prevent slurmctld abort on update of advanced reservation that contains no
    nodes.
bug 1814

Bug 1810

srun command line of either --mem or --mem-per-cpu will override both the
SLURM_MEM_PER_CPU and SLURM_MEM_PER_NODE environment variables.
Without this change, salloc or sbatch setting --mem-per-cpu (or a
configuration of DefMemPerCPU) would over-ride the step's --mem
value.

change was made.

This will make using the Cray test environemt easier

Conflicts:
	src/api/cache_info.c
	src/plugins/slurmctld/dynalloc/msg.c

Conflicts:
	src/plugins/accounting_storage/mysql/as_mysql_assoc.c

when removing a limit from an association on multiple clusters
at the same time.

to gain the correct limit when a parent account is root and you
remove a subaccount's limit which exists on the parent account.

Expect is sometimes splitting lines on long output bufffers
  resulting in this test to sporatically fail. This reduces
  the volume of output, which seems to fix the problem

This fixes changes made in commit d4d51de7
Which fails for a job state of Pending (needed to special case the zero value).

abort if specified acct_gather_energy plugin can not be loaded
  rather than deadlocking
bug 1797

instead of it's own.

limits so it is easier to change/add/remove any limit.

Conflicts:
	src/slurmctld/job_mgr.c

Under some conditions if an attempt to schedule the last task of
  a job array (the meta-record of the job array) fails, it's
  task ID will be changed from the appropriate value to NO_VAL.
bug 1790

Bug 1770

Revert modification that would NOT count pthreads that are being
  throttled against the slurmctld limit. Harvard reported that
  slurmctld would spawn so many pthreads that it failed. In
  extreme environments, the slurmctld could spawn tens of
  thousands of pthreads with the modified logic.

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

Conflicts:
	src/common/slurm_step_layout.c
	src/plugins/select/cons_res/job_test.c
	src/plugins/select/cons_res/job_test.h
	src/plugins/select/cons_res/select_cons_res.c
	src/srun/libsrun/opt.c