prevent NPE
rmeove compiler warning and add some comments
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.36
Merge remote branch 'origin/8.34' into 8.36

Conflicts:
	uk.ac.gda.core/src/gda/jython/GDAJythonInterpreter.java
Fix broken test, but also fix incomplete MockJythonServerFacade class
Merge remote-tracking branch 'origin/8.36'