of 4.

Only going to do this in the master as it may affect scripts.

This reverts commit 454f78e6.

Conflicts:
	NEWS

switch/cray: Refine logic to set PMI_CRAY_NO_SMP_ENV environment variable.
Rather than testing for the task distribution option, test the actual
task IDs to see fi they are monotonically increasing across all nodes.
Based upon idea from Brian Gilmer (Cray).

Add srun --accel-bind option to control how tasks are bound to GPUs and NIC
    Generic RESources (GRES).
Based in part upon work by Matthieu Ospici (ATOS).
gres/nic plugin modified to set OMPI_MCA_btl_openib_if_include environment
    variable based upon allocated devices (usable with OpenMPI and Melanox).
Reset GRES env vars after task affinity set

afterward cause a divide by zero error.

corruption if thread uses the pointer basing validity off the id.

Bug 1710

If an salloc or srun command is executed on a "front-end" configuration,
    that job will be assigned a slurmd shepherd daemon on the same host as used
    to execute the command when possible rather than an slurmd daemon on an
    arbitrary front-end node.

Bug 1495

Correct count of CPUs allocated to job on system with hyperthreads.
The bug was introduced in commit a6d3074d
On a system with hyperthreads:
srun -n1 --ntasks-per-core=1 hostname
you would get:
slurmctld: error: job_update_cpu_cnt: cpu_cnt underflow on job_id 67072

preempt/job_prio plugin: Implement the concept of Warm-up Time here. Use
the QoS GraceTime as the amount of time to wait before preempting.
Basically, skip preemption if your time is not up.

a job runs past it's time limit.

Bug 1705

However, --mem=0 now reflects the appropriate amount of memory in the
system, --mem-per-cpu=0 hasn't changed.  This allows all the memory to
be allocated in a cgroup but is not "consumed" and is available for
other jobs running on the same host.
Eric Martin, Washington University School of Medicine

Correct list of unavailable nodes reported in a job's "reason" field when
that job can not start.
bug 1614

which can be used to aggregate messages to the slurmctld into a single
message to reduce communication to the slurmctld.  Currently only epilog
complete messages and node registration messages use this logic.

bug 1679

Changes some variable names "norelation" to "no_relation"
Replace some blocks of spaces with tabs
Add definition of layouts "free" call to slurm.h.in
Add "layout" information to scontrol help message
Fix typo in error message
Translate a french error message to english "valide" to "valid"

Bug 1679

switch/cray: Revert logic added to 14.11.6 that set "PMI_CRAY_NO_SMP_ENV=1"
if CR_PACK_NODES is configured.
bug 1585

preempt/job_prio plugin: Implement the concept of Warm-up Time here. Use
the QoS GraceTime as the amount of time to wait before preempting.
Basically, skip preemption if your time is not up.

Bug 1548

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