Cargo test final
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	cmis-types-manager-web/src/main/webapp/dashboard/index.xhtml