Merge pull request #1797 from alex/retry-harder

Retry a third time on apt-get update failures.