Merge "Fix sriov test in baremetal deploy"