changes from Chris
Merge branch '8.30' of ssh://dasc-git.diamond.ac.uk/gda/gda-diamond into 8.30
Merge remote-tracking branch 'origin/8.30'