Only passing and logging extra env, not all of env, in tests.
Merge branch 'master' into replication
Merge branch 'master' of github.com:youtube/vitess