Merge "Remove proxy role from cfg node for virtual-mcp-pike-ovs"