re-implement changes after reset to earlier commit.
Merge branch 'gda-8.42' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into gda-8.42

Conflicts:
	uk.ac.gda.core/src/gda/device/detector/nxdata/NXDetectorDataFileLinkAppender.java