Further fix for refreshing access token

Ryan Hargrequested to merge
housekeeping/fix-oauth-token-renewal into develop

Merge request reports