Now exposing the lockserver version for keyspace and shard.
Merge branch 'master' into resharding
Merge branch 'master' into resharding
Add site_test Makefile target to run only recommended pre-install tests.
Bug fix for import. Sugu will do more later.
Merge branch 'resharding'
Merge branch 'trusty'
Adding GetKeyspaceCritical.
Remembering the mysql port in internal structure.

So we don't update it every time.
Merge branch 'resharding'
Merge branch 'master' of github.com:youtube/vitess