Temporarily increase timeout of HttpDownloadTest to 2 sec
Fix Xoo
Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
	sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java