Added a fix for some failing tests in NXMetaDataProviderTest.java.
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git

Conflicts:
	uk.ac.gda.core.test/src/gda/data/metadata/NXMetaDataProviderTest.java
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git
TESTING: fix after merge