Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  don't try to send in the test results until we restored qa.php.net
  Don't treat warnings as failures in the junit output

Conflicts:
	.travis.yml

diff --cc .travis.yml
index 2125e8d3d63f5b177563300dd1d80cd80787bdc7,31cdcd07f512a7a8eef2e1beab271f089d70ecb8..f0a6f257d5ac56226721045c7fa329324796b9d3
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -41,6 -39,4 +41,6 @@@ before_script
      - . ./travis/ext/pdo_pgsql/setup.sh
  
  # Run PHPs run-tests.php 
 -script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 -s
 +script:
-     - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
++    - ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120 -s
 +    - ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg