Fix OAuth2 client registration

The OAuth2 code confuses the id and clientId fields of the oauth2Clients directory.

The unit tests pass because for unit tests it's defined as having clientId as the id field, but the deployed configuration uses id as an auto-incremented id field. If one replaces the content of directory-test-config.xml with that of directory-contrib.xml then tests fail.