fix race condition on spot check
Merge branch 'master' of github.com:youtube/vitess
Merge branch 'master' into resharding