add raw methods for class to work in scans
change behaviour to match Javadoc
Merge branch 'gda-8.40' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-diamond.git into gda-8.40

Conflicts:
	uk.ac.gda.dls/src/gda/device/scannable/BeamlineConditionMonitorBase.java
Merge remote-tracking branch 'origin/gda-8.40'