Token Revocation - extend search to all token types.

Extend search to all token types when token is not found with token_type_hint.

This is for issue #159.