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)

(cherry picked from commit b3ab7f81)

* Fixed integration test

Conflicts:
	xwiki-commons-tools/xwiki-commons-tool-xar/xwiki-commons-tool-xar-plugin/src/main/java/org/xwiki/tool/xar/VerifyMojo.java

Conflicts:
	xwiki-commons-tools/xwiki-commons-tool-xar/xwiki-commons-tool-xar-plugin/src/main/java/org/xwiki/tool/xar/FormatMojo.java