Fixed checkstyle and license rules

Also renamed OAuthRegisteredService to OAuthClientWrapper to correctly reflect
its intent.