API Client renaming fixes
Fixing env variable handling
Merge pull request #223 from mozilla/client-fix

API Client renaming fixes
Tweak
Merge pull request #224 from mozilla/auth-fixes

Auth fixes