Add some retry to the service proxy.
Merge pull request #2281 from brendandburns/proxy

Add some retry to the service proxy.