Automatic merge from submit-queue etcd watcher: centralize error handling We should centralize error handling in watcher in run(). Otherwise this could silently return. Also we don't need the grpc code checking anymore. It's fixed.