Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  improve CURL tests to allow testing without separate server