Merge "app/registry: integrate into cluster/kube"