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.