rev 8
collapsed jwk and x509 URI's into single jwks_uri
cleanups