Merge branch 'master' into feature-resource-and-wiki-modules

Conflicts:
	xwiki-platform-core/pom.xml
	xwiki-platform-core/xwiki-platform-resource/pom.xml
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/src/main/java/org/xwiki/url/internal/XWikiURLRequestInitializer.java
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-standard/src/main/java/org/xwiki/url/internal/standard/DefaultStandardResourceConfiguration.java
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-standard/src/main/java/org/xwiki/url/internal/standard/StandardResourceConfiguration.java
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-standard/src/main/java/org/xwiki/url/internal/standard/StandardResourceFactory.java
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-standard/src/test/java/org/xwiki/url/internal/standard/DomainWikiReferenceResolverTest.java
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-standard/src/test/java/org/xwiki/url/internal/standard/ExtendedURLEntityResourceFactoryTest.java
	xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-standard/src/test/java/org/xwiki/url/internal/standard/StandardXWikiURLFactoryTest.java
	xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm