Bug 2430

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.

Conflicts:
	NEWS

Conflicts:
	META

a new account and making it a default all at once.

Bug 2428

Match acct_gather_energy/rapl plugin. Bug 2397.