Conflicts:
	src/common/slurm_protocol_pack.c

Don't trucate task ID information in "squeue --array/-r" output.
Task ID info in sview also expanded to 64 characters (from ~16 chars).

Fix for bad cut and paste.  Looks like the original code was just a copy
of the access parsing.

last_time would be uninitialized.

    slurmctld.

Use more flexible mechnanism to find json installation.

Fix srun from inheriting the SLURM_CPU_BIND and SLURM_MEM_BIND environment variables when running in an existing srun (e.g. an srun within an salloc).

Bug 1888

of Knight's corner.

Conflicts:
	src/slurmctld/job_mgr.c

At the start of a scheduling cycle, the job's "reason" field can
be cleared. If the scheduler fails to reach that job and set its
value to a new reason, the original reason was lost and the state
reports would report NoReason. This change saves the last reason
for a job being in a pending state and reports that value to the
user until we have a new valid reason for it still being in a
PENDING state.
bug 1919

Conflicts:
	contribs/pmi2/testpmi2.c
	src/slurmctld/node_scheduler.c

bug 1920

Improve job state reason string when required nodes not available.
bug 1920

Add sbatch "--wait" option that waits for job completion before exiting.
    Exit code will match that of spawned job.
but 1685