Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
Add user contributed test. Bug #61748
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add user contributed test. Bug #61748
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add user contributed test. Bug #61748