Change POM version to 4.0.0-sanitization-SNAPSHOT for the feature branch
POM cleanup and formatting
PLF-4356 : Upgrade GateIn 3.5.2.FINAL and JCR 1.15.2-GA (+ other CF modules)
WIKI-317 Wiki Sanitization

Conflicts:

	wiki-webapp/src/main/webapp/WEB-INF/conf/data/sandbox.xml

WIKI-317 Wiki Sanitization

WIKI-317 Wiki Sanitization
Merge remote-tracking branch 'origin/master' into feature/stabilization
Use 3-SNAPSHOT version of maven-depmgt-pom
Fix wiki test fail after upgrade jcr to 1.15.2-GA
PLF-4366: unified search : urls returned in search endpoint are not URLs
WIKI-341 wiki result opens with permalink
Revert "WIKI-341 wiki result opens with permalink"

This reverts commit 818ccb56414de943c0cc45bb05fc8ae48542abce.
WIKI-289 [Wiki]: Unknown error when click Compare Selected button in Page History
WIKI-282 Return all search result when limit is 0
WIKI-317 Wiki Sanitization
Change version to 4.0.0-SNAPSHOT
WIKI-341 wiki result opens with permalink
WIKI-341 wiki result opens with permalink
Merge branch 'feature/stabilization'
Fix version of Commons to 4.0.0-SNAPSHOT
Merge branch 'master' into feature/activity-type
WIKI-193 Fix bug exception when run wiki test