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

This reverts commit 454f78e6.

Conflicts:
	NEWS

bug 1724

Previously the test would generate an error if the default partition
  contained less than 3 nodes
bug 1720

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).

afterward cause a divide by zero error.

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

Bug 1710

Disable test with select/linear and only one 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.

-W/--wait is only supported by srun and should not show
up in the usage string of sbatch or salloc.

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

Use sleep with value less than 1 (e.g. 0.5)

These changes are required to support NetBSD.
1) Use standard -p option for time command in test17.35 instead of
GNU specific format string to fetch the elapsed (real) time.

2) Adjust date command calls in test22.1 to use short option
(--date -> -d), and move options before arguments. NetBSD,
unlike Linux, disallow non standard order.

3) Use standard -R option instead of -r for cp command in test30.1.

bug 1649