Fixed a bug in per RP token type handling
Merge branch 'master' into oidc-bcp-configuration