Conflicts:
	src/common/slurm_protocol_defs.c

Used a value of 3, it should have been a flag, #4

Need to exec() some process since linuxproc will never
signal a process named "slurmstepd"

No changes to logic

This records accounting for the job container created with a
PrologFlags option of "Contain" as added in commit
fc359331

Add PrologFlags option of "Contain" to create a proctrack container at
    job resource allocation time.
At job allocation time, a slurmstepd is spawned on every allocated
    compute node in which to place external processes (e.g. PAM
    can place ssh processes into a cgroup).
This entity is accounted for and reported by sacct as "<jobid>.extern".
Some more testing and development remain, but it mostly works.

Bug 1627

function.

test34.1 was failing with a configuration of
PreemptMode=suspend,gang
PreemptType=preempt/partition_prio
due to changes in commit f8fb79d5
That change appears to no longer be necessary and breaks a
valid configuration.

This is a special case. This change documents the way Slurm has
always worked.

Make sure that old step data is purged when a job is requeued.
Without this logic, if a job terminates abnormally then old step
data may be left in slurmctld. If the job is then requeued and
started on a different node, referencing that old job step data
can result in abnormal events. One specific failure mode is if
the job is requeued on a node with a different number of cores,
and the step terminated RPC arrives later, the job and step
bitmaps of allocated cores can differ in size generating an
abort.
bug 1660

TRES stuff

Conflicts:
	src/plugins/accounting_storage/mysql/as_mysql_job.c

Bug 1657

Bug 1618