Merge "(bug 42211) Fix the display of some user rights log entries"