Change DiCat config to be consistent with other beamlines
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-scm.git
DASCTEST-209 Update SLF4J to version 1.7.6