Added some etcd retries to try to work around some flakes we see in Travis.
Merge pull request #2279 from brendandburns/integration

Added some etcd retries to try to work around some flakes we see in Travis