Fix for SCATTER-272
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git into 8.36
Fix for SCATTER-272