Merge branch '2.3' into 2.6

* 2.3:
  [DependencyInjection] Removed extra strtolower calls
  [Validator] Fixed Choice when an empty array is used in the "choices" option
  Fixed tests
  [StringUtil] Fixed singularification of 'selfies'
  Fix Portuguese (Portugal) translation for Security
  improved exception when missing required component
  CS: unalign =
  Show a better error when the port is in use
  CS: unalign =>
  [FrameworkBundle] Check for 'xlf' instead of 'xliff'
  Add better phpdoc message for getListeners method of the EventDispatcher

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/Validator/Constraints/ChoiceValidator.php

Author: fabpot

Security/RememberMe/DoctrineTokenProvider.php

@@ -95,7 +95,7 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
         $paramValues = array('value' => $tokenValue,
                              'lastUsed' => $lastUsed,
                              'series' => $series,);
-        $paramTypes =  array('value' => \PDO::PARAM_STR,
+        $paramTypes = array('value' => \PDO::PARAM_STR,
                              'lastUsed' => DoctrineType::DATETIME,
                              'series' => \PDO::PARAM_STR,);
         $updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);