GDA-5621 When handling an exception in a the scan command thread the
pipeline should be allowed 10s to empty naturally
GDA-5621 Create a set of scannables for triggering exceptions at
strategic points during scans
Merge branch 'master' of
ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git

Conflicts:
	uk.ac.gda.core/src/gda/scan/ScanBase.java
GDA-5585
Merge branch 'master' of ssh://dasc-git.diamond.ac.uk/gda/gda-core