Resolved issue where etcd watch events were not properly handled