PLF-5208 : Centralized in unique place all the workspaces configuration
PLF-5233 : Full Integration of INSP in platform.
PLF-5233 : Full Integration of INSP in platform.
Merge remote-tracking branch 'origin/master' into feature/centralized-workspaces
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
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
DEP-41 : Update dependencies of JGroups to 3.0.13.Final to be compatible with INSP
PLF-5233 : Full Integration of INSP in platform. (Fix unit test due to the use of jgroups3.0.x instead of jgroups 2.6.x)
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ

Conflicts:
	pom.xml
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
Use a dedicated maven-depmgt-pom for the FB
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ

Conflicts:
	pom.xml
PLF-5421 :Update version of kernel | core | jcr | ws | gatein to be compliant with plf-4.x(fix conflicts)
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
PLF-5421 : Update version of kernel | core | jcr | ws | gatein to be compliant with plf-4.x (Fix JUNIT tests)
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ
Merge remote-tracking branch 'origin/master' into feature/infinispan-full-integ