[flashrom-gerrit] Change in flashrom[master]: Hack up test_v2.sh to work better with upstream