Conflicts:
	contribs/perlapi/libslurm/perl/Slurm.xs
	slurm/slurm.h.in
	src/slurmctld/job_mgr.c
	src/slurmctld/step_mgr.c
	src/srun/libsrun/launch.c
	src/srun/libsrun/opt.c

Remove redundant persist_rem field from job record
Fix logic for buffer state related to failure handling
Move pre_run logic into a separate thread for improved system performance
Disable changes to job burst buffer field
burst_buffer contents are validated at job submit time and
  data is possibly being staged at later times. It can not
   be changed.
Refactor bb_p_job_cancel() logic
Fix some job staging problems
Eliminate logging of unchanged pool information
Document that job arrays don't support burst buffers
Refactor job buffer allocation to eliminate race condition with
  stage out. Needs more work after prolog_running functionality
  is in place (merged from v14.11).
Improve cold-start state clean up

This propagates the logic from commit aa81c550
into another place where the job CONFIGURING flag is set.

Clean-up of of job stage-out and teardown logic
Improve restart state clean-up

Bug 1770

Bug 1770
Prevent segfaults and return reservation with NULL partition.

Bug 1770
Continuation of ad8279d010.
Add custom typemaps that free pointer after it has been copied onto the stack.

Bug 1770
Just return the static memory, it's not going to increase.

Fix some job state logic
Add logic to preserve persistent buffer account, QOS and partition for limit enforcement

Fix slurm.spec file for recent layouts change
Refactor bb_pack_bufs() and bb_alloc_job_rec() functions

Add partition information to buffer record for limit enforcement

Add account and QOS to burst buffer data structures for TRES limit work
sview: Correct size units
sview: Fix free of uninitialized iterator logic
burst_buffer.conf: Fix parsing of DefaultPool parameter

Add support for access and type fields in interactive buffer creation

Move limits checks to burst_buffer/common
Disable persistent burst buffer with numeric value
Refactor bb_p_job_get_est_start() logic
Split out persistent buffer create/delete into a pthread
Fix job buffer size parsing logic
Get through stage-in and support for non-Cray systems (e.g. VM)

Add new buffer state of "BB_STATE_PENDING"
Refactor job buffer state structure
Refactor job buffer creation environment
Rename "bb_hash" to "bb_ahash"
Set up job state hash table
Add magic cookies to data structures
Rename bb_find_job_rec() to  bb_find_alloc_rec()
Rename bb_free_rec() to bb_free_alloc_buf()

thing (-F exclusive) instead of -F share.

bug 1849

add option --enable-really-no-cray to allow vanilla linux installatio…

add option --enable-really-no-cray to allow vanilla linux installations on Cray external login nodes

Remove the "power_cpufreq" layout-type and transfer the
 logic on the "power" layout-type, by creating a new
 layout named "cpufreq" under the already existing
 layout-type "power". Based on this modification adjust
 the logic of powercapping.

This reverts part of commit c2fbf88f
see bug 1846

Fix scheduling anomaly with job arrays submitted to multiple partitions,
    jobs could be started out of priority order.
bug 1892

portion of a job array is pending after it's initial start in the
database it could create another row for the remain array instead
of using the already existing row.

bug 1840

opposite.

Renames some sview variables for better clarity and put some node
  fields into alphabetic order