Revert "Add definition of gda.dls-config"

This reverts commit 4f820fa9b30f06f05194a0a1426cc4c60c417213.
make BeamMonitor class look at multiple shutters

as FE has two shutters: one controlled by the machine and one by the beamline
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git

Conflicts:
	dls-config/bin/gda_servers_local
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git
Merge remote-tracking branch 'origin/gda-8.40'
call the new method of the superclass after is was improved
remove compiler warnings