bug #4158 Events page says no privileges with ALL PRIVILEGES
Fix merge conflicts