Fixing a merge error that added an inline plugin into the BuildConfig.groovy file
Reverting mis-commited change work EWB
Merge remote-tracking branch 'gitlab/etriks-1.2' into research

Conflicts:
	grails-app/views/datasetExplorer/datasetExplorer.gsp