Merge "Improved job backoff handling to be more properly per-server"