oversaw authorization-server stuff
Merge commit '71fc2791db7e5c29371b8af9e32be4b951744419'