Handle failure retries better.

We'll wait up to 60 seconds before retrying the same tasks.

@andykram