Remove deprecated methods.
Replace resetDefault by resetDefaultSettings(true)
Minor test fix
Remove Gateway and IDelete deprecated definitions

Both services have been deprecated since the 4.4 line
and are so being removed for 5.1.

Conflicts:
	components/blitz/src/ome/services/blitz/gateway/services/impl/RenderingServiceImpl.java
Replace resetDefault by resetDefaultSettings.
Merge 'origin/develop' into deprecate-rnd-methods

Conflicts:
	components/blitz/src/loci/ome/io/OmeroReader.java
Fix calls to resetDefaultSettings in Python
Merge 'origin/develop' into deprecate-rnd-methods

Conflicts:
	components/tools/OmeroCpp/src/omero/callbacks.h
Fix Hibernate error on Web user creation.
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3037 (Group sudo)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3058 (Homebrew nginx (rebased onto develop))
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3069 (Scalebar)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3109 (Disable keyboard navigation (up, down, left, right) for jquery tabs)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3115 (CLI admin diagnostics: only check readability of var folder)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3127 (Batch Annotate with Read-only)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3133 (General Pane alignment)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3139 (Plane info units)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3142 (Deprecate  methods/services)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3148 (Rnd rgb)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 3155 (Re changes)