Merge "Move k8s etcd definitions to reclass."