Merge "Fix scenario test fails when port_vnic_type is set"