Merge "Update virtual-mcp11-k8s-contrail"