remove compiler warnings
CORE (8.40) Remove relative paths from diamond gdaclient command line.
Merge branch 'gda-8.40' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git into gda-8.40
Merge remote-tracking branch 'origin/gda-8.40'

Conflicts:
	dls-config/bin/gdaclient