Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  improve CURL tests to allow testing without separate server
Update UPGRADING according to bug fix
Add bug fix to NEWS
Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6