Small fixes to tests.
Some more test fixes.
Adding 'vtctl GetSrvKeyspace' and 'GetSrvShard'.

Using GetSrvKeyspace in resharding test instead of zk call.