Conflicts:
	testsuite/expect/Makefile.am
	testsuite/expect/Makefile.in
	testsuite/expect/README

Conflicts:
	NEWS

Remove the 1024-character limit on lines in batch scripts, which was
causing long lines to be silently truncated. I noticed it when jobs were
getting created with fewer dependencies than specified.

Also increase the line length when showing job info.

No change in logic

sched/backfill: If a job can not be started within the configured
    backfill_window, set it's start time to 0 (unknown) rather than the end
    of the backfill_window.
bug 2100

If a pending job array has multiple reasons for being in a pending state,
    then print all reasons in a comma separated list.

Before:
             JOBID PARTITION     NAME     USER ST       TIME  NODES NODELIST(REASON)
       97354_[1-4]     debug      tmp    jette PD       0:00      1 (Resources)

After:
             JOBID PARTITION     NAME     USER ST       TIME  NODES NODELIST(REASON)
       97354_[1-4]     debug      tmp    jette PD       0:00      1 (Resources,JobHeldUser)

The tests were sometimes failing unless I gathered accounting
  data at more frequent intervals. This seems to work with default
  accounting collection intervals.

When extra pools were reported by Cray API, it was not multiplying
  the buffer count by granularity to get the total size, but was
  just getting the counts.

job's TimeLimit if the job did't request --time

Bug 2130

When extra pools were reported by Cray API, it was not multiplying
  the buffer count by granularity to get the total size, but was
  just getting the counts.

Move slurmctld mail handler to separate thread for improved performance.
Original logic did fork/exec without separate thread and if the
slurmctld memory size is huge, then the time required for fork()
to complete can be significant.
bug 2252

Conflicts:
	src/slurmctld/job_scheduler.c

Conflicts:
	src/slurmctld/job_mgr.c

Avoid hard-link/copy of script/environment files for job arrays. Use the
    master job record file for all tasks of the job array.
back port of commit 41eead64
bug 2220

Refactor logic to synchronize active bach jobs and their script/environment
    files, reducing overhead dramatically for large numbers of active jobs.
backport of commit 41eead64
bug 2220

If a job can never be started due to unsatisfied job dependencies, report
    the full original job dependency specification rather than the dependencies
    remaining to be satisfied (typically NULL).
bug 2197

in use.

Conflicts:
	src/slurmctld/proc_req.c