Vtctld now uses servenv.
Merge branch 'master' into resharding