when the DBD is down.

Conflicts:
	src/sview/job_info.c

These are only stubs at this time

Conflicts:
	src/plugins/task/cray/task_cray.c

This only prints the message if the user enables more detailed logging
bug 1171

Conflicts:
	src/common/assoc_mgr.c

Conflicts:
	src/plugins/task/cray/task_cray.c

creating possible memory corruption when a hash isn't found.

Log Cray MPI job calling exit() without mpi_fini(), but do not treat it as
a fatal error. This partially reverts logic added in version 14.03.9.
bug 1171

Bug 1289

could result in seg fault.

This only enables this configuration without providing the necessary
infrastructure to support it.
Add preempt_by_qos flag to select/cons_res
In select/cons_res add extra row to scheduling array if preempt/qos
  is used. This is used only when a job is started via preempting
  another job in the same partition, but a lower priority QOS.
Update preemption documentation

No change in logic

better.

in BASIL was changed.

Conflicts:
	src/plugins/task/cray/task_cray.c

Conflicts:
	doc/man/man1/scontrol.1