Merge "Fix IUsb version number in vts test" into pi-dev