XMAP: I removed the use of the finder to get the controleer. It can now obviously be set using the setter method in spring. Update beamline config to do this, dont add old code back in.
Merge branch '8.38' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-epics.git into 8.38