Addresses comments from: https://github.com/etcd-io/etcd/pull/12671#pullrequestreview-593942302
This commit significantly reduces volume of custom code in etcd client v3, while preserving full existing functionality.
