Conflicts:
	src/plugins/burst_buffer/cray/burst_buffer_cray.c
	src/plugins/select/cons_res/select_cons_res.c

The gprof tool is showing most time is being consumed by the bit_test()
  function as called from the select plugin, which in turn was called
  by the backfill scheduler. These changes replace the for loop end-points.
  Previous logic tested for all possible nodes. The new logic identifes
  the first and last bit set in the node bitmap and uses those end-points
  instead. Node the logic to find the first and last bits set starts off
  with a word-based search (testing for a 64-bit zero value rather than
  testing each individual bit). The net result is a small performance
  improvement.
bug 2588

Bug 2622.

Bug 2622.

burst_buffer/cray - Decrement job's prolog_running counter if pre_run fails.
bug 2621

If a job is no longer in configuring state, then clear the prolog_running
  counter on slurmctld restart or reconfigure.
bug 2621

For case where job can't start and there are no running jobs
to remove in order to establish estimated start time.

When determining when a pending job will be able to start, rather
  than testing after removing each running job and trying to schedule
  the pending jobs, remove multiple jobs that all end about the
  same time before testing. This reduces the number of calls to
  the job placement logic, which is time consuming.

list_peek_next(), like list_next() but WITHOUT advancing the pointer

work correctly when --with-<package> where no input was given.

Document and log cases where max jobs per user or partition is
  equal or greater than the max jobs test. In that case, a single
  user can easily stop all backfill scheduling.

doing a ntasks_per_core=1

Fix for job "--contiguous" option that could cause job allocation/launch
    failure or slurmctld crash.
bug 2573

Conflicts:
	META
	NEWS

constraints mattered in a job.

    Details include:
    A job doesn't request memory but the system is running
    with CR_*MEMORY with no default memory limit and the job requests nodes
    with features of different sizes.  Previously the order of constraints
    mattered where the smaller memory node would need to be requested first
    or the job would fail.

    Bug 2608

This reverts commit f559a55c.

constraints mattered in a job.

Details include:
A job doesn't request memory but the system is running
with CR_*MEMORY with no default memory limit and the job requests nodes
with features of different sizes.  Previously the order of constraints
mattered where the smaller memory node would need to be requested first
or the job would fail.

Bug 2608