Adding a test to make sure the new master knows it's a master.
Merge branch 'master' of github.com:youtube/vitess