XAS-56 add ignore option
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git