Merge "Remove docker-related definitions from k8s models."