Fix failing NXDetectorAreaDetectorIntegrationTest test (code okay)
Fix failing ADPilatusTest test (code okay)
Merge branch '8.30' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into 8.30
Fixed failing EpicsTrajectoryMoveControllerAdapterIntegrationTest test
(by repairing tested code)
Merge remote-tracking branch 'origin/8.30'

Conflicts:
	uk.ac.gda.epics.test/src/gda/device/continuouscontroller/EpicsTrajectoryMoveControllerAdapterIntegrationTest.java