Fix to http://jira.diamond.ac.uk/browse/SCI-1758

Conflicts:
	org.dawb.workbench.ui/src/org/dawb/workbench/ui/editors/preference/EditorConstants.java