OP-1243 fixed duplicate popup menu entries appearing when opening menu multiple times
- also removed two unconventional Close menu entries
- and other minor cleanups

+review OPReview
Merge remote-tracking branch 'origin/next' into filnet/OP-1243_opmap_widget_duplicate_popup_menu_entries
Merge branch 'filnet/OP-1243_opmap_widget_duplicate_popup_menu_entries' into next