XAS-172_refactor: bm26a configuration change
Merge branch 'XAS-172_refactor' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git into XAS-172_refactor

Conflicts:
	configurations/bm26a-config/scripts/localStation.py
	plugins/fr.esrf.gda.beamline.bm26a/src/gda/exafs/scan/preparers/BM26aDetectorPreparer.java
	plugins/fr.esrf.gda.beamline.bm26a/src/gda/exafs/scan/preparers/BM26aOutputPreparer.java
	plugins/fr.esrf.gda.beamline.bm26a/src/gda/exafs/scan/preparers/BM26aSamplePreparer.java
XAS-172_refactor: bm26a preparers