Fix to unit test
Merge branch 'master' of https://github.com/youtube/vitess
Merge branch 'master' into gtid