Merge "vswitchperf: Update merge and verify jobs"