Merge "change sriovnicswitch to be first with openvswitch"