TRQ-2503. Jobs killed when rerun

Fixed a problem where jobs that had been preempted
and then rerun again would be killed before they
were suppose to be done.

Conflicts:

	src/resmom/mom_job_func.c

Conflicts:

	src/resmom/mom_job_func.c