fixes which were part of BLXXJ-18
Merge branch 'master' of ssh://dasc-git.diamond.ac.uk/gda/gda-common-rcp