Conflicts:
	src/plugins/task/cray/task_cray.c

Conflicts:
	doc/man/man1/scontrol.1

The job_submit/pbs plugin sets the original job "comment" to the
origial stdout path, which is appended to.

No change in logic

Previously printed uint64_t using %lu, which resulted in build warning

In srun the default timeout in _wait_nodes_ready function is 3 sec.
This patch make timeout adaptiv, for default  max_delay=400 sec it make less rpc request and give beter 'user feelings'.

Bug #1276

in commit 1953fdecbb.

associations in slurmctld.

There was a cut/paste problem with duplicate information, which
has been removed.
Also minor format change (added some spaces).

Squeue was modified to return an error if an invalid node name
was specified for filtering jobs, which broke a test.

Conflicts:
	META
	NEWS

Job wait reason of "ReqNodeNotAvail" expanded to identify unavailable nodes
(e.g. "ReqNodeNotAvail(Unavailable:tux[3-6])").
bug 1277

an error message and return 1.

related to bug 1239