Use shared watch code in kubelet etcd config

Given that I'm not trying to introduce that capability right now, I'm just going to revert this specific change. It's just noise at this point.