SCATTER-278
Fix for parse error in trigger processing
SCATTER-287
Updates made so that ispybapi branch now complies against master
Merge branch 'ispybapi' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git into ispybapi