Fixing these tests, haven't passed for a while...
All versions in API are now int64.

That's more specific than 'int'. Will work better with
other topo.Server implementations.
Revert "Fixing these tests, haven't passed for a while..."

This reverts commit fda22a954d52456c66e0afdda64017205d8773f5.
Merge branch 'master' into resharding
Fixing this test for vt_occ2 -> vtclient rename.
Merge branch 'master' into resharding
Merge branch 'master' into resharding