Cancelling a watch now cancels the underlying go-etcd watch (which cancels the underlying connection)

Also: telling the etcdadapter to Disconnect cancels all inflight watches.