Fix concurrency problem for topology
Merge branch 'master' of https://github.com/youtube/vitess