Workaround etcd Watch timeout bug

We should consider moving watch to its own file.  its 200 lines of code now and a reader should be able to ignore it when trying to dive into how the coordinator works.