PLF-5208 : Centralized in unique place all the workspaces configuration
Merge remote-tracking branch 'origin/master' into feature/centralized-workspaces
UI-2815: Incorrect UI of Search Result Suggestion
Merge remote-tracking branch 'origin/master' into feature/centralized-workspaces
Merge remote-tracking branch 'origin/feature/centralized-workspaces' into feature/infinispan-full-integ

Conflicts:
	integ-calendar/integ-calendar-social/pom.xml
	integ-calendar/pom.xml
	integ-ecms/integ-ecms-social/pom.xml
	integ-ecms/pom.xml
	integ-forum/integ-forum-social/pom.xml
	integ-forum/pom.xml
	integ-gatein/pom.xml
	integ-search-portlet/pom.xml
	integ-search-service/pom.xml
	integ-social/integ-social-ecms/pom.xml
	integ-social/pom.xml
	integ-wiki/integ-wiki-social/pom.xml
	integ-wiki/pom.xml
	pom.xml