This reverts commit 5bf40e44.

pre-increment.

The "dw_wlm_cli paths" command returns an error if no #DW options.

commit:508f866e

Conflicts:
	etc/slurmd.service.in

Bug 2095

Increase dead socket timeout from 5 to 10 minutes before purge
Log connect failure as "debug" rather than "error" as it can be
  generated due to a race condition at step termination.

Previous logic would not check on remaining persistent burst buffer
space needed for a job.

This might be related to bug 2028

Add logic to call the "setup" function.

in an hour counting multiple times.

if this was the case we could get bug 2068
http://bugs.schedmd.com/show_bug.cgi?id=2068 to happen.

This will be fixed in a future commit.

Return permission denied if regular user tries to release job held by an
    administrator.
bug 2087

Previous logic ignored lack of memory, file descriptors, buffers, etc.
bug 2028

quick & dirty patch for smap to compile with reentrant ncurses

Smap seems to be ok with this. The proper approach would be to root out
all usage of the global COLS and LINES and switch to local variables,
as section 'Some Notes of Caution' of the ncurses intro suggests.

No change to logic

Fix creation of advanced reservation of cores on nodes which are DOWN.
There seems to be a bug with reservations using a node list (e.g.
Nodes=something + CoreCnt=something).  The result is a reservation made that's
arguably broken; listing the reservation (scontrol show reservation) will show
"Nodes=" (blank) and "CoreCnt=0".

It's very easy to reproduce, just by doing the following against a node in a
DOWN (also tested with POWER_UP) state:
scontrol create ReservationName=tmp_res StartTime=now EndTime=now+600
Nodes=<some_non_idle_node> CoreCnt=1 Users=<some_valid_user>
scontrol show reservation.
bug 2078

Better identify who can create and destroy persistent burst buffers.

submit_time.  0 means the job isn't eligible yet so we need to treat it so.

PrologFlags work: Setting a flag of "Contain" implicitly sets the "Alloc"
    flag. Fix code path which could prevent execution of the Prolog when the
    "Alloc" or "Contain" flag were set.
bug 2074

If a user tries to create/destroy a persistent burst buffer and
  that is disabled (the default), return a permission denied error
  rather than an invalid request error.
cray bug 832678

Bug 2071