Keycloak module and updates to authz
Work in progress
Updated for changes from master