Added convenient methods for Java to Jython collection conversion.
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.36
update to the example config for the updated Jython course
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.36
Remove now unused classes
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.36
EXAMPLE: ignore users/data directory in example-config
Prune namespaces in example-config server.xml
example-config: use <context:property-placeholder> once for the client/server
Example - add test plugin. Add MVC example
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.36
MvcExample - add use of NUmberEditControl
ADMIN: convert uk.ac.gda.example.test to a fragment, add dependency to it
Add handy command-line program for listing objects in the RMI registry

(cherry-pick of 0e708dd from master)
Add calculator view for GDA training
GDA-4992 Add <gda:rmi-export> and <gda:rmi-import> elements for exporting/importing objects using RMI
Add gda 1.1 namespace to example-config client.xml & server.xml files
Add MotorPositionEditorControl ( currently a copy from exafs.ui.data)
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.36

Conflicts:
	uk.ac.gda.example.test/META-INF/MANIFEST.MF
GDA-5808 chunk size needs to be smaller than datasize

this should ensure that