Conflicts:
	src/slurmctld/job_mgr.c

The slurm_sbcast_lookup() API was recently changed to take a step ID.
This changes the Perl API to match that.

If a job is being tested to determine if it can ever run, then do
not set the reason based upon account/QOS limits since that reason
will likely be wrong anyway.
bug 1186

Let operators (in addition to user root and SlurmUser) see job script
for other user's jobs.
bug 1176

bug 1195

Fix bug that prevented preservation of a job's GRES bitmap on slurmctld
restart or reconfigure (bug was introduced in 14.03.5 "Clear record of a
job's gres when requeued" and only applies when GRES mapped to specific
files).
bug 1192

permission for the batch step.

Add to make files, add appropriate wildcards, add to spec file.

These files come directly from the Debian package and need some
work for proper configuration in a more general setting.

Move SlurmSchedLogFile into alphabetic order in the output of
"scontrol show config"

Otherwise there will be no log file to write to, resulting in an
abort
bug 1185

See bug 1184

There were several local strcmp functions that handled NULL input.
I removed the local functions and changed the code to use xstrcmp
from src/common/xstring.c instead. No changed in functionality.

Add support for job dependencies jointed with OR operator (e.g.
"--depend=afterok:123?afternotok:124").

Conflicts:
	META
	NEWS

Conflicts:
	META
	src/slurmd/slurmd/req.c