Merge "Allow additional port_vnic_type"