PRD-3965 Fix up errors in execution after refactor
Merge remote-tracking branch 'upstream/PRD-3965_mongoDB_Native_Datasource' into PRD-3965_MongoDB_Native_Datasource

Conflicts:
	designer/datasource-editor-bigdata/source/org/pentaho/reporting/ui/datasources/bigdata/BigDataDataSourcePlugin.java