modified so it merges more cleanly with another branch
Merge branch 'master' into salt

Conflicts:
	job/eclglobalvariables/src/main/java/org/hpccsystems/pentaho/job/eclglobalvariables/ECLGlobalVariablesDialog.java