updated from 8.30 branch - fixes made by Chris which work on 8.30
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git into 8.36