Use shared watch code in kubelet etcd config

I now realize that this change is probably unnecessary, which would help answer my question about how to share `makeContainerKey` with pkg/registry/etcd/etcd.go. Should I just revert this change?