Assist with spring oauth2 upgrade

This builds on @dynamind's previous PR. All the tests pass. :smiley: