Converted all clientId references on authentication to clientKey, down through the OAuth2 layer