XCOMMONS-636: Observation manager does not fully overwrite existing event listener

(cherry picked from commit 1c148320c37bcd1353af737f17b0e1632fdb502c)

Conflicts:
	xwiki-commons-core/xwiki-commons-observation/xwiki-commons-observation-local/src/test/java/org/xwiki/observation/ObservationManagerTest.java