Add authorization ID to authentication configuration
Merge remote-tracking branch 'dmlloyd/authz-id-conf'