Merged in issue-484 (pull request #322)
https://bitbucket.org/openid/fapi/issues/484/key-management-in-fapi2-advanced
https://bitbucket.org/openid/fapi/issues/484/key-management-in-fapi2-advanced