WIP: align with tangrammer/cylon/oauth2-ms