Merge branch '4.4' into 5.1

* 4.4:
  Remove "version" from composer.json files, use "branch-version" instead

Author: nicolas-grekas

composer.json

@@ -41,10 +41,17 @@
     ],
     "minimum-stability": "dev",
     "extra": {
+        "branch-version": "5.1-dev",
         "thanks": {
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
+<<<<<<< HEAD
     },
-    "version": "5.1.x-dev"
+    "extra": {
+        "branch-version": "5.1-dev"
+    }
+=======
+    }
+>>>>>>> 4.4
 }