Merge remote-tracking branch 'origin/2.6' into 2.7

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Validator/Constraints/EmailValidator.php

Author: aitboudad

Tests/Resource/DirectoryResourceTest.php

@@ -69,7 +69,7 @@ public function testIsFresh()
         $this->assertTrue($resource->isFresh(time() + 10), '->isFresh() returns true if the resource has not changed');
         $this->assertFalse($resource->isFresh(time() - 86400), '->isFresh() returns false if the resource has been updated');
 
-        $resource = new DirectoryResource('/____foo/foobar'.rand(1, 999999));
+        $resource = new DirectoryResource('/____foo/foobar'.mt_rand(1, 999999));
         $this->assertFalse($resource->isFresh(time()), '->isFresh() returns false if the resource does not exist');
     }
 

Tests/Resource/FileResourceTest.php

@@ -48,7 +48,7 @@ public function testIsFresh()
         $this->assertTrue($this->resource->isFresh($this->time + 10), '->isFresh() returns true if the resource has not changed');
         $this->assertFalse($this->resource->isFresh($this->time - 86400), '->isFresh() returns false if the resource has been updated');
 
-        $resource = new FileResource('/____foo/foobar'.rand(1, 999999));
+        $resource = new FileResource('/____foo/foobar'.mt_rand(1, 999999));
         $this->assertFalse($resource->isFresh($this->time), '->isFresh() returns false if the resource does not exist');
     }