Merge "More tweaks to job backoff code"