protect against NPE
Merge branch '8.34' of ssh://dasc-git.diamond.ac.uk/gda/gda-core into 8.34
Core - Fix NXDetector test failures. CollectionStrategy is called after
other plugins atScanEnd
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git