Merge branch '2.3' into 2.6

* 2.3:
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  [Enhancement] netbeans - force interactive shell when limited detection
  [StringUtil] Fixed singularification of 'movies'
  Fix some phpdocs for Twig extensions & templating helpers
  Use specialized config methods instead of the generic ifTrue() method
  [DoctrineBridge] Add missing variable declaration in testcase

Conflicts:
	src/Symfony/Component/Console/Application.php

Author: nicolas-grekas

Tests/ContainerAwareEventManagerTest.php

@@ -16,6 +16,9 @@
 
 class ContainerAwareEventManagerTest extends \PHPUnit_Framework_TestCase
 {
+    private $container;
+    private $evm;
+
     protected function setUp()
     {
         $this->container = new Container();