Fix to http://jira.diamond.ac.uk/browse/SCI-1644
Fixed test that runs okay with Java 1.7 u25 but not u45
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git