PLF-5208 : Centralized in unique place all the workspaces configuration
Merge remote-tracking branch 'origin/master' into feature/centralized-workspaces
Merge remote-tracking branch 'origin/master' into feature/centralized-workspaces
Merge remote-tracking branch 'origin/feature/centralized-workspaces' into feature/infinispan-full-integ

Conflicts:
	pom.xml
	wiki-extension/pom.xml
	wiki-extension/wiki-extension-webapp/pom.xml
	wiki-injector/pom.xml
	wiki-macros/pom.xml
	wiki-macros/wiki-macros-iframe/pom.xml
	wiki-renderer/pom.xml
	wiki-service/pom.xml
	wiki-upgrade-plugins/pom.xml
	wiki-webapp/pom.xml