MBS-6813: Bring back add/remove PUID edits in read only mode
MBS-6813: Allow rejecting add PUIDs and accepting remove PUID edits
Merge branch 'mbs-6813' into beta