Customised Person roles and Organisation Roles for ETD object, changed _name_edit to work nicer with one role dropdowns