Workaround etcd Watch timeout bug

Good catch! Fixing.