EDXDController and EDXDMappingController changed for I08. Before the 
aquisition time was not setup because the method setAquisitionTime 
was empty in EDXDMappingController.Remove setAquisitionTime in 
EDXDMappingController. 
A new method setPresetMode and getPresetMode were added to set the 
preset mode through GDA.
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into 8.36
Changes in EDXDController and EDXDMappingController
Reintroduce the empty method setAquisitionTime() and add a flag 
aquisitionTimeOn to call the method setAquisitionTime of the parent 
class.
For consistency, changes PresetMode to PresetType and PRESET_MODES to 
PRESET_TYPES.
Zebra: add support for the "Copy motor pos to Zebra" buttons on the ENC screen
Zebra: use getPVInteger, not getIntegerPVValueCache, in encCopyMotorPosToZebra; otherwise caput isn't always effective
Remove warning from ZebraImpl
Merge remote-tracking branch 'origin/8.36'

Conflicts:
	uk.ac.gda.epics/src/gda/device/detector/xmap/edxd/EDXDController.java
	uk.ac.gda.epics/src/gda/device/detector/xmap/edxd/EDXDMappingController.java
Merge remote-tracking branch 'origin/8.38'