Merge branch '2.6' into 2.7

* 2.6:
  [DependencyInjection] fixed service resolution for factories
  [acl][command][SecurityBundle] Fixed user input option mode to be an Array

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Author: fabpot

Command/SetAclCommand.php

@@ -78,7 +78,7 @@ protected function configure()
 EOF
             )
             ->addArgument('arguments', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'A list of permissions and object identities (class name and ID separated by a column)')
-            ->addOption('user', null, InputOption::VALUE_REQUIRED, 'A list of security identities')
+            ->addOption('user', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A list of security identities')
             ->addOption('role', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'A list of roles')
             ->addOption('class-scope', null, InputOption::VALUE_NONE, 'Use class-scope entries')
         ;