Merge branch '2.3' into 2.7

* 2.3:
  remove unnecessary retrieval and setting of data
  avoid (string) catchable fatal error for __PHP_Incomplete_Class instances
  sendContent return as parent.
  [FrameworkBundle] Fix a typo

Author: fabpot

Command/TranslationUpdateCommand.php

@@ -46,8 +46,9 @@ protected function configure()
             ))
             ->setDescription('Updates the translation file')
             ->setHelp(<<<'EOF'
-The <info>%command.name%</info> command extract translation strings from templates
+The <info>%command.name%</info> command extracts translation strings from templates
 of a given bundle or the app folder. It can display them or merge the new ones into the translation files.
+
 When new translation strings are found it can automatically add a prefix to the translation
 message.