(cherry picked from commit 5e192319)

Conflicts:
	pom.xml

(cherry picked from commit 1c148320)

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

(cherry picked from commit 8ff948cfc98a3bf48e75df9af7d1c32b1600e379)

[Misc] Jenkins is now failing the build on some errors reported by Jasmine. These errors have been there for a long time but previously it seems Jenkins wasn't checking the log output. Silence those for now. If a jasmine test fails, the build will stop anyway. We might want to direct the logs to an output file iun target/ instead in the future.

(cherry picked from commit 40f049ba)

This reverts commit e03e1a56.

(cherry picked from commit 8219e33f)

Fixed

(cherry picked from commit 5d39c50a)

(cherry picked from commit c229ddd5)

(cherry picked from commit 1e2231fb)

Conflicts:
	xwiki-commons-core/xwiki-commons-job/src/main/java/org/xwiki/job/internal/JobStatusSerializer.java

(cherry picked from commit 0f60183f)

* make sure status log can never be null

* fix merge

(cherry picked from commit 44241dbc)

(cherry picked from commit e3511df4)

(cherry picked from commit 226e652a)

(cherry picked from commit 29136a3a)

(cherry picked from commit b6ad7d25)

(cherry picked from commit b45472ce)

(cherry picked from commit 0131ed49)

(cherry picked from commit ff238bdd)

(cherry picked from commit 93c76061)

(cherry picked from commit 3c4672bb)

* Selenium Maven Plugin (latest 2.3) doesn't work with the latest version of Selenium (2.40.0). Fortunately we can run the old Selenium 1 tests without it.

(cherry picked from commit 9e2988b8)

(cherry picked from commit b151f8b8)

(cherry picked from commit bd97d799)

(cherry picked from commit 784e6bca)