Fixing a couple corner cases for other environments.
Merge branch 'master' of github.com:youtube/vitess