Merge branch '2.8' into 3.0

* 2.8:
  Fix merge

Conflicts:
	src/Symfony/Component/DependencyInjection/composer.json

Author: nicolas-grekas

composer.json

@@ -19,7 +19,7 @@
         "php": ">=5.5.9"
     },
     "require-dev": {
-        "symfony/yaml": "~2.8.7|~3.0.9|~3.1.3|~3.2",
+        "symfony/yaml": "~2.8.7|~3.0.7|~3.1.1|~3.2",
         "symfony/config": "~2.8|~3.0",
         "symfony/expression-language": "~2.8|~3.0"
     },