Merge branch '2.1'

* 2.1:
  replaced magic strings by proper constants
  refactored tests for Request
  fixed the logic in Request::isSecure() (if the information comes from a source that we trust, don't check other ones)
  added a way to configure the X-Forwarded-XXX header names and a way to disable trusting them
  fixed algorithm used to determine the trusted client IP
  removed the non-standard Client-IP HTTP header

Conflicts:
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
[HttpFoundation] reverted variable rename
Merge branch '2.0' into 2.1

* 2.0:
  [HttpFoundation] reverted variable rename

Conflicts:
	src/Symfony/Component/HttpFoundation/Request.php
Merge branch '2.1'

* 2.1:
  [HttpFoundation] reverted variable rename
updated CHANGELOG for 2.0.19
update CONTRIBUTORS for 2.0.19
updated VERSION for 2.0.19
updated CHANGELOG for 2.1.4
updated VERSION for 2.1.4
[HttpKernel] Add DI extension configs as ressources when possible
Bugfix for creating cookie on loginSuccess in AbstractRememberMeServices
Fix problem when 1 column identifier in propel is a string.

The ModelChoiceList thinks it can be used as the index of the ChoiceList, when it can only be used if it is an integer.
[HttpFoundation] added a small comment about the meaning of Request::hasSession() as this is a recurrent question (refs #4541)
[HttpFoundation] Request::getRealMethod() now returns UPPERCASE
merged branch vicb/realfix (PR #6160)

This PR was merged into the master branch.

Commits
-------

bad50ac [HttpFoundation] Request::getRealMethod() now returns UPPERCASE

Discussion
----------

[HttpFoundation] Request::getRealMethod() now returns UPPERCASE
removed unused attribute from routing.xsd
it should be possible to define the defaults, req. and options in any order, just like in YAML
refactor to an xsd:group
make id attribute required
add default for pattern for clarity