This commit significantly reduces volume of custom code in etcd client v3, while preserving full existing functionality.