GDA-5863 after changes to how scans/commands are paused/aborted/halted
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git