Merge pull request #1791 from alex/retry-update

Retry apt-get update on failure -- rabbitmq's servers are failing a bunch