Merge "Reschedule jobs that crash partway through" into oc-dev