BM26: scan preparers
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git
XAS-182: add xml to configure detector for XasAsciiDataWriter
BM26a: fix npe