properly set the resource IDs on the authorization request
handle approval filtering based on client id
Revert "handle approval filtering based on client id"

This reverts commit 40d5cf52f13e92b0485bccb0b1a2f8b04e535ddf.
protect the /approvals endpoint from client access unless the oauth.approvals scope has been set.
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
upgrade the AWS deployment plugin
the s3 wagon doesn't differentiate between a read repo and deploy repo, and tries to download dependencies using s3. renaming the repo for deployment mitigates the problem. this also requires that the server is renamed in settings.xml