Conflicts:
	NEWS
	src/plugins/burst_buffer/cray/burst_buffer_cray.c
	src/plugins/burst_buffer/generic/burst_buffer_generic.c

Don't decrease a pool's "used_space" below the amount we believe has
  been allocated in case there is a buffer allocation in progress
  while the _load_state() function is running.
Initialize a mutex
Move loading of state_save_location earlier

The partition-specific SelectTypeParameters parameter can now be used to
    change the memory allocation tracking specification in the global
    SelectTypeParameters configuration parameter. Supported partition-specific
    values are CR_Core, CR_Core_Memory, CR_Socket and CR_Socket_Memory. If the
    global SelectTypeParameters value includes memory allocation management and
    the partition-specific value does not, then memory allocation management for
    that partition will NOT be supported (i.e. memory can be over-allocated).
    Likewise the global SelectTypeParameters might not include memory management
    while the partition-specific value does.
bug 2239

If a reservation's nodes value is "all" then track the current nodes in the
    system, even if those nodes change. Nodes will automatically be added to
    or removed from a reservation when slurm.conf changes.
bug 2204

Bug 2281

Rename the variable to match rest of codebase while here. This is related to
bug 2295, although snprintf() protects against buffer overflow in 15.08 and up.

If burst buffer space is reserved through an advanced reservation
  then reduce the space reserved by the amount of space already
  allocated to jobs running in that reservation.

Previous logic had a window between a job's allocation of burst
  buffer resources and those resources being recorded in use.
  During that interval, those same resources could be allocated
  (again) to another job. This change eliminates the race condition.

This reverts commit 2d13e016.

This reverts commit 3300184a.

Make advanced reservation logic work for altternate pool names.
If no pool specified, use default pool

Burst buffer advanced reservation units treated as bytes (per documentation)
    rather than GB.

time.

nojobs.

Rename avail_space to total_space and correct value displayed by scontrol show burst

Support per-pool granularity logic