Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt

ext/soap/tests/bugs/bug28985.phpt

@@ -44,7 +44,7 @@ array(42) {
  string iUserPassword;
 }"
   [8]=>
-  string(86) "struct MGCodeLibelle {
+  string(87) "struct MGCodeLibelle {
  string Code;
  string Libelle;
  boolean Default;
@@ -203,4 +203,4 @@ array(42) {
   string(76) "struct GetEnvironnementResponse {
  MGEnvironnement GetEnvironnementResult;
 }"
-}
+}