Fix scatter query with first ShardConn result being empty
Merge branch 'master' of https://github.com/youtube/vitess