Merge "Remove unneeded linux parameters from virtual-mcp11-k8s-calico"