Merge branch 'master' into DataManagement

Conflicts:
	console/console-config/src/main/resources/platform/work/i18n/portal.po
	console/console-config/src/main/resources/platform/work/i18n/portal_de.po
	console/console-config/src/main/resources/platform/work/i18n/portal_en.po
	console/console-config/src/main/resources/platform/work/i18n/portal_es.po
	console/console-config/src/main/resources/platform/work/i18n/portal_fr.po
	console/console-config/src/main/resources/platform/work/i18n/portal_it.po
	console/console-config/src/main/resources/platform/work/i18n/portal_pt_BR.po