expvar -> stats phase 3
Merge branch 'master' into resharding