Merge "Add explicit GENDER support to userrights-*usergroup"