Merge "Fix virtual-mcp11-contrail model"