Traj Scan: Changes made to work on I18. Changes made by RobW and ChrisC
Merge branch '8.30' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into 8.30