Merge branch '2.7' into 2.8

* 2.7:
  [Console] Application update PHPDoc of add and register methods
  [Config] Extra tests for Config component
  Fixed bugs in names of classes and methods.
  [DoctrineBridge] Fixed php doc
  [FrameworkBundle] Fixed parameters number mismatch declaration
  [BrowserKit] Added test for followRedirect method (POST method)
  Fix the money form type render with Bootstrap3
  [BrowserKit] Uppercase the "GET" method in redirects
  [WebProfilerBundle] Fixed  JSDoc parameter definition
  [HttpFoundation] HttpCache refresh stale responses containing an ETag

Conflicts:
	src/Symfony/Component/BrowserKit/Tests/ClientTest.php
	src/Symfony/Component/Security/Acl/Resources/bin/generateSql.php

Author: nicolas-grekas

Resources/views/Collector/time.html.twig

@@ -160,7 +160,7 @@
         /**
          * Query an element with a CSS selector.
          *
-         * @param string selector a CSS-selector-compatible query string
+         * @param {string} selector - a CSS-selector-compatible query string
          *
          * @return DOMElement|null
          */