Merge remote-tracking branch 'origin/slurm-14.03'

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

src/plugins/task/cray/task_cray.c

@@ -550,6 +550,9 @@ static int _check_status_file(stepd_step_rec_t *job,
 	char status;
 	int rv, fd;
 
+	debug("task_p_post_term: %u.%u, task %d",
+	      job->jobid, job->stepid, job->envtp->procid);
+
 	// We only need to special case termination with exit(0)
 	// srun already handles abnormal exit conditions fine
 	if (!WIFEXITED(task->estatus) || (WEXITSTATUS(task->estatus) != 0))