(cherry picked from commit 1269c56e)

Conflicts:
	xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-handlers/xwiki-commons-extension-handler-jar/src/test/java/org/xwiki/extension/jar/TestJarExtensionClassLoaderManager.java

(cherry picked from commit 0290ad39)

(cherry picked from commit 8b60b44f)

(cherry picked from commit 89440931)

XCOMMONS-732: Don't display extensions twice in the Core Extensions section after manually installing a JAR file

(cherry picked from commit 9aacfec1)

Conflicts:
	xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/repository/core/DefaultCoreExtensionRepositoryTest.java

(cherry picked from commit b257f353)

* fix test

(cherry picked from commit d667c231)

Conflicts:
	xwiki-commons-core/xwiki-commons-properties/src/test/java/org/xwiki/properties/internal/DefaultBeanManagerTest.java

(cherry picked from commit 2739c027)

(cherry picked from commit f74a0791)

XCOMMONS-673: DefaultVelocityEngine is doing a lot of locking

(cherry picked from commit 11071d1c)

Conflicts:
	xwiki-commons-core/xwiki-commons-velocity/src/test/java/org/xwiki/velocity/internal/DefaultVelocityEngineTest.java

* Fix the AttributeFilter for image elements.

(cherry picked from commit 0b20e67b)

(cherry picked from commit b298a974)

(cherry picked from commit 6d458a20)

* various bulletproofing

(cherry picked from commit bcd345f7)

Conflicts:
	xwiki-commons-core/xwiki-commons-extension/xwiki-commons-extension-api/src/test/java/org/xwiki/extension/repository/local/DefaultExtensionSerializerTest.java

XWIKI-11239: Stacktrace isn't displayed if you want to reset your password and the SMTP server isn't configured

* Improve algorithm

Conflicts:
	xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-default/src/test/java/org/xwiki/component/embed/EmbeddableComponentManagerTest.java

[Misc] Fix test. Funnily doing a "ping host" locally now resolves to 127.0.53.53... See https://www.icann.org/news/announcement-2-2014-08-01-en and http://serverfault.com/questions/626612/dns-just-started-resolving-my-server-prod-addresses-to-127-0-53-53

* more javadoc

(cherry picked from commit 198ded1d)

(cherry picked from commit 177d2ff7)

(cherry picked from commit 5e192319)

(cherry picked from commit b7dda99b)

XCOMMONS-644: Installing on root an extension installed on some wiki(s) remove all its backward dependencies

(cherry picked from commit e83c5d50)

(cherry picked from commit 90333c3a)

(cherry picked from commit 185df630)

XCOMMONS-637: The Eclipse plugn embedded in xwiki-commons-tool-verification-resources does not work with latest EclipseCS version