Fox of broken translations service
Fix of broken translations service
Fix broken tests for resources & i18nService
Merge remote-tracking branch 'origin/master' into BS-11394_ProcessMonitoring-Improvements

Conflicts:
	main/bonita-portal.js
	main/common/services/i18n.js
Merge branch 'master' into 'BS-11394_ProcessMonitoring-Improvements'
Merge remote-tracking branch 'origin/master' into BS-11394_ProcessMonitoring-Improvements

Conflicts:
	main/bonita-portal.js
Merge remote-tracking branch 'origin/BS-11394_ProcessMonitoring-Improvements' into BS-11394_ProcessMonitoring-Improvements
Merge branch 'BS-11394_ProcessMonitoring-Improvements' into 'master'