Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)