Stop using stats.States in most cases.
Merge branch 'master' of github.com:youtube/vitess