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

oh I'm just not convinced that this is a problem that will be fixed by waiting-- if a 16 second wait doesn't fix it then 256 second wait is probably just delaying the inevitable...

Anyway, people have reported this problem in real live clusters, so I don't think it's just a flaky test problem.