REVOKE GRANT OPTION regression

Recent commit ec88aa2 added 'grantoption' to the privilege name. This name is used by the catalog cache which broke "revoke grant option" since the privilege names do not match.

[localhost:21000] default> create role foo_role;
[localhost:21000] default> grant all on server to foo_role with grant option;
[localhost:21000] default> revoke grant option for all on server from foo_role;
ERROR: IllegalStateException: null