fix: Tokens in config are no longer ignored when there are tokens in the environment, part of refactoring in preparation for app token refreshing

fix: Tokens in config are no longer ignored when there are tokens in the environment, part of refactoring in preparation for app token refreshing #916