Jython: added import of hashmap to fix bug on b18
Merge branch '8.30' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.30