XCOMMONS-484: Silent conflict merge when diff between previous/next is not at the exact same indices than in previous/current diff

(cherry picked from commit e352487e)

(cherry picked from commit 7a8f91bd)

(cherry picked from commit 8b37728b)

Conflicts:
	xwiki-commons-core/pom.xml

XCOMMONS-471: Replace any object array that faul to be serialized by a String when serializing Job status
(cherry picked from commit 89753ef7)

(cherry picked from commit 181e6391)

* better composite filter
(cherry picked from commit 89b1ba93)

* missing @since
(cherry picked from commit 48ff37cd)

(cherry picked from commit 0f35c4da)

* don't remove all other components when the component manager is removed from itself

XCOMMONS-451: Improve generic XML syntax

Done.

This reverts commit 087f393c.

XCOMMONS-447: DefaultFilterDescriptorManager#createFilterProxy should return the passed fiter if it already support the required events

* add generic event exception

* missing header

This reverts commit a2b68486.

Revert until tests are fixed.

This reverts commit ce995891.