Integrate new OAuth scopes mechanism from PR#91, checkstyle fixes