This refactor removes a redundancy where we had etcd configuration under kvdb and kvdb/etcd packages.