Merge branch '4.4'

* 4.4:
  fix merge (bis)
  fix merge

Author: nicolas-grekas

Tests/Constraints/UrlValidatorTest.php

@@ -88,6 +88,7 @@ public function getValidRelativeUrls()
     {
         return [
             ['//example.com'],
+            ['//examp_le.com'],
             ['//symfony.fake/blog/'],
             ['//symfony.com/search?type=&q=url+validator'],
         ];
@@ -213,7 +214,6 @@ public function getInvalidRelativeUrls()
     {
         return [
             ['/example.com'],
-            ['//examp_le.com'],
             ['//example.com::aa'],
             ['//example.com:aa'],
             ['//127.0.0.1:aa/'],