Conflicts:
	src/plugins/select/cray/select_cray.c

Failure has never been observed, but initialize the used variable
  before calling the function so we don't re-use old data if the
  function returns an error.

Rename an improperly named variable in the logic scontrol uses to
  print node information ("total_used" was really "idle_cpus"), so
  the logic looks the same as that used in sinfo to determine node
  state.

Include warning for Cray simulation as reminder for developers to
change code as needed.

This whole process could probably be done better by keeping track of
old values and new values and only calling one function instead of a
pre and post function, but that can probably wait for future generations
of the code as it works now and is probably adequate for the time being.

Bug 2352

e696d308

If a job was requeued while some prolog was running (e.g. waiting
  for node boot, burst buffer, PrologSlurmctld, etc.) then wait
  until that completes before considering starting the job again.

No functional change, although confine to master to limit any
chance of bad interaction with pre-existing plugins.

back the way it was before commit cf354d1e and 7a187dce.

Consistantly use American English for
existant -> existent
assocation -> association

Correct some typos, and one grammatical mistake.

payload whereas before it didn't.

Conflicts:
	src/slurmctld/job_mgr.c

BurstBuffer/cray - Defer job cancellation or time limit while "pre-run"
    operation in progress to avoid inconsistent state due to multiple calls
    to job termination functions.
bug 2454

Otherwise call fclose(NULL) iff the ClusterName is not set and the
clustername file does not exist. Should not happen in production.

Coverity #67041.