GCP-5929
Fix to OpenSheetControllerTest
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/i18n/Messages.properties
	src/main/webapp/WEB-INF/pages/defineVariableImport.html