XWIKI-9409: Change the organization of XE Xars to Integrate Workspaces by default.
XE-1325: Integrate the Workspaces feature by default in the default XE distribution.
Merge remote-tracking branch 'upstream/master' into XWIKI-9409

Conflicts:
	xwiki-enterprise-web/pom.xml
Merge pull request #39 from gdelhumeau/XWIKI-9409

XE-1325: Integrate the Workspaces feature by default in the default XE distribution