Merge "Add 'viewmyprivateinfo', 'editmyprivateinfo', and 'editmyoptions' rights"