Conflicts:
	doc/html/team.shtml

Patch from John Thiltges, University of Nebraska-Lincoln.

and smaller block when using sub block allocations

to boot.  This should happen very rarely.

starts in accounting.

Add an srun shepard process to cancel a job and/or step of the srun process
is killed abnormally (e.g. SIGKILL).

starts in accounting.

There was an oversight in the GracTime preemption logic that resulted
in repeatedly reading the PreemptType configuration parameter and
doing a string comparison. This change will improve efficiency of
that logic.