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