KAZOO-1539: continue refactor of authz and jonny5