Refactor environment variable handling in CLI#24

bwebs wants to merge 1 commit intomainlkrdev/cli:mainfrom

bryan/draft-api-auth-prefixlkrdev/cli:bryan/draft-api-auth-prefixCopy head branch name to clipboard