Revert "Fix to dependencies"

This reverts commit 17232d1e9a6ce9699f7ea7069b1d35ec9b2574ef.
Revert "ADMIN: changes following Dawn refactor"

This reverts commit 743309fd5a2494fd4a7f51b1888c5556e72d943d.
Changed imports to deal with removal of gda.core plugin.
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git