Merge branch 'master' into resharding
Exporting tablet type in vttablet.
Merge branch 'resharding'