Implementing patch from #941066, removing block/unblock, add/remove role operations; core user mod now handles those directly.