Fixing this test for vt_occ2 -> vtclient rename.
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'master' into resharding