add option to provide detector pixel size units in NXDetector node which is required by 2D diffraction data reduction project.
Merge branch '8.38' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.38

Conflicts:
	uk.ac.gda.core/src/gda/device/detector/nxdata/NXDetectorDataFileLinkAppender.java
Merge remote-tracking branch 'origin/8.38' into gda-8.42

Conflicts:
	uk.ac.gda.core/src/gda/data/scan/datawriter/NexusDataWriter.java
add option to provide detector pixel size units in NXDetector node which is required by 2D diffraction data reduction project.

Conflicts:
	uk.ac.gda.core/src/gda/device/detector/nxdata/NXDetectorDataFileLinkAppender.java
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
BLXI-225: provide unit for the 'count_time' data in the detector nexus data file
http://jira.diamond.ac.uk/browse/BLXI-225
BLXI-227: add detector name string to 'local_name' under thr NXdetector node in the pixium nexus data file
http://jira.diamond.ac.uk/browse/BLXI-227
BLXI-224: add the pixel size information with unit for area detector under NXdetector node
http://jira.diamond.ac.uk/browse/BLXI-224
Revert "BLXI-225: provide unit for the 'count_time' data in the detector nexus data file http://jira.diamond.ac.uk/browse/BLXI-225"

This reverts commit 01347afea4776b6a69d659bbdefac5aa3b6317ba.
BLXI-225: provide unit for the 'count_time' data in the detector nexus data file
http://jira.diamond.ac.uk/browse/BLXI-225
BLIX-153: "Abort all running commands, scan and scripts" does not work on terminal in 'analyserscan'
enable to stop scannable and detector in the current scan only if you set the property to true. Defult is false - so the existing behaviour does not change.
http://jira.diamond.ac.uk/browse/BLIX-153

Task-Url: http://jira.diamond.ac.uk/browse/BLIX-143
make sure both wavelength and energy from monochromator be written in file if both provided.
Merge branch 'gda-8.42' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into gda-8.42
move SimpleUDPServerScannable from uk.ac.gda.px to uk.ac.gda.core
Core now requires Java 1.7
GDA-6083: Call to getLastScanDataPoint() return NULL when called from a scannable's atScanEnd() if you only have one scan data point. 

Ensure the last scan data point is called before atScanEnd of the scannables.

Task-Url: http://jira.diamond.ac.uk/browse/GDA-6083
GDA-6084: fix the mis-map of call atScanEnd() and atScantStart() in the ScannableImpl
http://jira.diamond.ac.uk/browse/GDA-6084
Merge branch 'gda-8.42' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into gda-8.42
Fix NXDetectorAreaDetectorIntegrationTest