Traj Scan: Changes made to work on I18. Changes made by RobW and ChrisC

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