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

Do you really think so?  I've only ever seen this on Travis, and I think that sleeping for 5 minutes is better than having a flaky test...