merge develop -Dorg -Ssuccess-only: PR 3037 (Group sudo)
merge develop -Dorg -Ssuccess-only: PR 3057 (Rating web)
merge develop -Dorg -Ssuccess-only: PR 3058 (Homebrew nginx (rebased onto develop))
merge develop -Dorg -Ssuccess-only: PR 3069 (Scalebar)
merge develop -Dorg -Ssuccess-only: PR 3098 (Metadata reimport)
merge develop -Dorg -Ssuccess-only: PR 3109 (Disable keyboard navigation (up, down, left, right) for jquery tabs)
merge develop -Dorg -Ssuccess-only: PR 3115 (CLI admin diagnostics: only check readability of var folder)
merge develop -Dorg -Ssuccess-only: PR 3117 (Bugfix: Paste pending rendering settings)
merge develop -Dorg -Ssuccess-only: PR 3122 (Customise Windows service name: omero.windows.servicename)
merge develop -Dorg -Ssuccess-only: PR 3127 (Batch Annotate with Read-only)
merge develop -Dorg -Ssuccess-only: PR 3128 (OmeroCpp: Disable remaining integration search test)
merge develop -Dorg -Ssuccess-only: PR 3133 (General Pane alignment)
merge develop -Dorg -Ssuccess-only: PR 3139 (Plane info units)
merge develop -Dorg -Ssuccess-only: PR 3142 (Deprecate  methods/services)
merge develop -Dorg -Ssuccess-only: PR 3147 (Update develop submodules)
merge develop -Dorg -Ssuccess-only: PR 3148 (Rnd rgb)
merge develop -Dorg -Ssuccess-only: PR 3150 (Fix copy of help menu.)
merge develop -Dorg -Ssuccess-only: PR 3151 (Clear activities dialog on user switch)
merge develop -Dorg -Ssuccess-only: PR 3152 (Make sure the background of the PreviewCanvas is drawn)
merge develop -Dorg -Ssuccess-only: PR 3153 (Fix weblient crash and handle broken image links in public shares correctly)