Add support for client_credentials based access tokens & remove client_id from additional information field of access token JSON response