re-apply patch to services module for oauth2_server integration