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

Correct tracking of licenses for suspended jobs on slurmctld reconfigure or
restart. Previously licenses for suspended jobs were not counted, so
the license count could be exceeded with those jobs get resumed.

commit a9dc50d4.

Add sbcast support for file transfer to resources allocated to a job step
rather than a job allocation.

be the SLURM_*_PROTOCOL_VERSION.

bug 1178

No change in functionality, just eliminated a call to time().

Insure that a file needed for the test exists. This problem happens
on emulated cray systems.

Conflicts:
	src/plugins/jobcomp/mysql/jobcomp_mysql.c