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

In the sequence 4, 16, 256, that last wait is way too long. Recommend sleep+sleep or something that grows even slower.