Fix to http://jira.diamond.ac.uk/browse/SCI-1392

Conflicts:
	uk.ac.diamond.scisoft.analysis/src/uk/ac/diamond/scisoft/analysis/io/HDF5Loader.java