Merge branch 'master' into feature-xwikisas

pom.xml

xwiki-platform-core/pom.xml

xwiki-platform-core/xwiki-platform-activeinstalls/pom.xml

...tiveinstalls/xwiki-platform-activeinstalls-client/pom.xml

...s-client/xwiki-platform-activeinstalls-client-api/pom.xml

...tiveinstalls/xwiki-platform-activeinstalls-common/pom.xml

...tiveinstalls/xwiki-platform-activeinstalls-server/pom.xml

...s-server/xwiki-platform-activeinstalls-server-api/pom.xml

...ls-server/xwiki-platform-activeinstalls-server-ui/pom.xml

...activeinstalls/xwiki-platform-activeinstalls-test/pom.xml

...st/xwiki-platform-activeinstalls-test-pageobjects/pom.xml

...lls-test/xwiki-platform-activeinstalls-test-tests/pom.xml

xwiki-platform-core/xwiki-platform-activitystream/pom.xml

...-activitystream/xwiki-platform-activitystream-api/pom.xml

...m-activitystream/xwiki-platform-activitystream-ui/pom.xml

xwiki-platform-core/xwiki-platform-administration/pom.xml

...administration/xwiki-platform-administration-test/pom.xml

...st/xwiki-platform-administration-test-pageobjects/pom.xml

...ki/administration/test/po/TemplateProviderInlinePage.java

...ion-test/xwiki-platform-administration-test-tests/pom.xml