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
Remove further resetDefaults uses in OmeroPy
Fix more resetdefault issues found by Mark
Remove IceMapper FIXME; unneeded
Revert change to thumbnail usage
Remove further references to gateway
Remove flim-omero.py
Revert changes to image.resetDefaults
Revert change to ThumbnailStore.resetDefaults
Silence CPP errors from callbacks
Disable delete.cpp example
Silence other example warnings while we're at it
Merge 'origin/develop' into deprecate-rnd-methods

Conflicts:
	components/blitz/src/loci/ome/io/OmeroReader.java