Fix for vtgate and tabletconn
Merge branch 'master' of https://github.com/youtube/vitess