merge develop -Dorg -Ssuccess-only: PR 3037 (Group sudo)
merge develop -Dorg -Ssuccess-only: PR 3069 (Scalebar)
merge develop -Dorg -Ssuccess-only: PR 3109 (Disable keyboard navigation (up, down, left, right) for jquery tabs)
merge develop -Dorg -Ssuccess-only: PR 3133 (General Pane alignment)
merge develop -Dorg -Ssuccess-only: PR 3148 (Rnd rgb)
merge develop -Dorg -Ssuccess-only: PR 3155 (Re changes)
merge develop -Dorg -Ssuccess-only: PR 3156 (Templates cleanup)
merge develop -Dorg -Ssuccess-only: PR 3157 (Reset password)
merge develop -Dorg -Ssuccess-only: PR 3160 (Try search repeatedly until success)
merge develop -Dorg -Ssuccess-only: PR 3187 (5 0 6 rebase)
merge develop -Dorg -Ssuccess-only: PR 3190 (Insight units)
merge develop -Dorg -Ssuccess-only: PR 3197 (Tools flake8)
merge develop -Dorg -Ssuccess-only: PR 3198 ( Tables metadata really check the size after close)
merge develop -Dorg -Ssuccess-only: PR 3199 (Update develop submodules)
merge develop -Dorg -Ssuccess-only: PR 3201 (Removed generic type from JComboBox (1.6 compliance))
merge develop -Dorg -Ssuccess-only: PR 3204 (Allow to set feedback URL via environment variable)
merge develop -Dorg -Ssuccess-only: PR 3205 (OMERO5.1DEV__15: fix tolerance types with nonegative_float)
merge develop -Dorg -Ssuccess-only: PR 3206 (c++ green!)
merge develop -Dorg -Ssuccess-only: PR 3208 (Update the OMERO install script to test Web login with CSRF (rebased onto develop))
merge develop -Dorg -Ssuccess-only: PR 3209 (omero_client)