XMAP: code improvements
Epics: changed timeout for epics from 30 seconds to 5.
new EPICS motor position Comapare script allow to set motor Limits
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git
Merge remote-tracking branch 'origin/8.36'

Fix up previous attempt to perform this merge which instead left master
with none of the incoming changes.

Conflicts:
	uk.ac.gda.epics/src/gda/device/detector/xmap/edxd/EDXDMappingController.java
	uk.ac.gda.epics/src/gda/epics/connection/EpicsController.java
Merge branch '8.36'
Merge remote branch 'origin/master'
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git
Merge commit '12d23518c26e1a715419e3364ff144b5d6f78702'

Conflicts:
	uk.ac.gda.epics/src/gda/device/detector/xmap/EpicsXmapController3ROI.java
	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 branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git
Merge remote-tracking branch 'origin/i20_prod'
XMAP: Fixed warning