Merge branch '2.3' into 2.6

* 2.3:
  CS: fixes
  Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
  [travis] Kill tests when a new commit has been pushed
  fixed CS
  Change behavior to mirror hash_equals() returning early if there is a length mismatch
  CS fixing
  Prevent modifying secrets as much as possible
  Update StringUtils.php
  Whitespace
  Update StringUtils.php
  CS: general fixes
  [SecurityBundle] removed a duplicated service definition and simplified others.

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php

Author: fabpot

Tests/Iterator/FilePathsIteratorTest.php

@@ -36,23 +36,26 @@ public function getSubPathData()
         return array(
             array(
                 $tmpDir,
-                array( // paths
+                array(
+                    // paths
                     $tmpDir.DIRECTORY_SEPARATOR.'.git' => $tmpDir.DIRECTORY_SEPARATOR.'.git',
                     $tmpDir.DIRECTORY_SEPARATOR.'test.py' => $tmpDir.DIRECTORY_SEPARATOR.'test.py',
                     $tmpDir.DIRECTORY_SEPARATOR.'foo' => $tmpDir.DIRECTORY_SEPARATOR.'foo',
                     $tmpDir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar.tmp' => $tmpDir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar.tmp',
                     $tmpDir.DIRECTORY_SEPARATOR.'test.php' => $tmpDir.DIRECTORY_SEPARATOR.'test.php',
                     $tmpDir.DIRECTORY_SEPARATOR.'toto' => $tmpDir.DIRECTORY_SEPARATOR.'toto',
                 ),
-                array( // subPaths
+                array(
+                    // subPaths
                     $tmpDir.DIRECTORY_SEPARATOR.'.git' => '',
                     $tmpDir.DIRECTORY_SEPARATOR.'test.py' => '',
                     $tmpDir.DIRECTORY_SEPARATOR.'foo' => '',
                     $tmpDir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar.tmp' => 'foo',
                     $tmpDir.DIRECTORY_SEPARATOR.'test.php' => '',
                     $tmpDir.DIRECTORY_SEPARATOR.'toto' => '',
                 ),
-                array( // subPathnames
+                array(
+                    // subPathnames
                     $tmpDir.DIRECTORY_SEPARATOR.'.git' => '.git',
                     $tmpDir.DIRECTORY_SEPARATOR.'test.py' => 'test.py',
                     $tmpDir.DIRECTORY_SEPARATOR.'foo' => 'foo',