Merge "etcd3 as a base service"