pre-patch-avail cleanup, test updates
change SHOW_SET_ROLE to SET_ROLE token
addming TOK_SHOW_SET_ROLE