GPII-1061: Make oauth2ClientId available to the Privacy page
Merge branch 'GPII-17' into GPII-1036
Merge remote-tracking branch 'simon/GPII-1036' into GPII-1036
GPII-1036: Removed logout from authorization

Removed logout from the authorization page. This is a temporary measure until we can determine the most appropriate way to handle the redirects and etc needed for the logout workflow from this page.
GPII-1036: Adding back in the username