fix(etcd): do not advance the watch revision on a timeout, and make the recovery reload cheap (#13721)