Conflicts:
	src/slurmctld/job_mgr.c

No changes to logic

Previously an error() would be logged when the attempt to open the job
script using the new directory format failed but the successive fallback to the
old directory structure was successful, leading to confusion when troubleshooting.

Move emitted warnings to debug(), and only error() after failing to open in both
directory structures. Add a note about backwards compatibility to both functions -
we cannot remove these fallbacks as directory structure for pending jobs does not
change on Slurm version update, and people may need to chain multiple version
update together to get to a current slurm version which would correctly update
slurmctld state files but leave pending jobs in the old directory structure.

Bug #2244.

If a job is requeued while in the process of being launch, remove it's
    job ID from slurmd's record of active jobs in order to avoid generating a
    duplicate job ID error when launched for the second time (which would
    drain the node).
bug 2240

In slurmctld log file, log duplicate job ID found by slurmd. Previously was
    being logged as prolog/epilog failure.
bug 2240

Conflicts:
	META
	NEWS

The problem comes from situations where a node range is given, leaving the
task count at NO_VAL is the desired behavior in this case.

so we can set it correctly before tasks are set.

messages like
FAILURE: 1 scontrol show assoc_mgr did not show correct information (6 != 5).

to happen erroneously.

The error messages associated with these are:

/home/tim/slurm/src/common/callerid.c:337:21: warning: address of array 'entryp->d_name' will always evaluate to 'true' [-Wpointer-bool-conversion]
                else if (!entryp->d_name)
                         ~~~~~~~~~^~~~~~
1 warning generated.
/home/tim/slurm/src/common/gres.c:831:19: warning: comparison of unsigned expression < 0 is always false [-Wtautological-compare]
                if ((tmp_uint64 < 0) || (tmp_uint64 >= NO_VAL)) {
                     ~~~~~~~~~~ ^ ~
1 warning generated.
/home/tim/slurm/src/slurmctld/node_mgr.c:1684:26: warning: if statement has empty body [-Wempty-body]
                        if (first_new == NULL);
                                              ^
/home/tim/slurm/src/slurmctld/node_mgr.c:1684:26: note: put the semicolon on a separate line to silence this warning
/home/tim/slurm/src/slurmctld/node_mgr.c:1756:26: warning: if statement has empty body [-Wempty-body]
                        if (first_new == NULL);
                                              ^
/home/tim/slurm/src/slurmctld/node_mgr.c:1756:26: note: put the semicolon on a separate line to silence this warning
/home/tim/slurm/src/slurmctld/node_mgr.c:1830:26: warning: if statement has empty body [-Wempty-body]
                        if (first_new == NULL);
                                              ^
/home/tim/slurm/src/slurmctld/node_mgr.c:1830:26: note: put the semicolon on a separate line to silence this warning
/home/tim/slurm/src/plugins/switch/generic/switch_generic.c:837:27: warning: address of array 'if_rec->ifa_addr->sa_data' will always evaluate to 'true' [-Wpointer-bool-conversion]
                        if (!if_rec->ifa_addr->sa_data)
                            ~~~~~~~~~~~~~~~~~~~^~~~~~~

news

no matter who calls the function.

function to common.c from last commit.

through sacctmgr.

select/cray: Prevent NHC from running more than once per job or step.
bug 2192

In both sched/basic and backfill: If a job can not be started due to some
    account/qos limit, then don't start other jobs which could delay jobs. The
    old logic would skip the job and start other jobs, which could delay the
    higher priority job.
bug 2129

Without this change, one of the two job steps could consume all
  memory and delay the second step.

Conflicts:
	configure