Refactored support for logging out Oauth2 logged in users with Apiv2