Added dicat properties to be used by beamline configs
GDA 5844 change package name type for DLSdicat
dls-config - replace java command with load_java.
DLS-CONFIG - rename java.sh to loadjava.sh
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git into 8.36
GDA-5922 Rename java to loadjava.sh in dls-config
GDA-5922 Rename java to loadjava.sh in dls-config, and make non-executable
Merge remote-tracking branch 'origin/8.36'

Conflicts:
	dls-config/bin/loadjava.sh
Merge remote-tracking branch 'origin/8.34'