[CS Fix] Consistent coding-style of concatenation operator usage
YamlDumper should dump Definition::getFactoryClass() setting
Enforce sprintf for exceptions
merged branch dantleech/enforce_sprintf_for_exceptions (PR #7620)

This PR was squashed before being merged into the master branch (closes #7620).

Discussion
----------

Enforce sprintf for exceptions

| Q             | A
| ------------- | ---
| Bug fix?      |no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | [yes|no]
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/2483

Changed format of exceptions which concatenate strings as follows

````
throw new \Exception('The '.$something.' needs the '.$foobar.' parameter');
````

to

````
throw new \Exception(sprintf('The %s needs the %s parameter', $something, $foobar));
````

This follows discussion on mailing list: https://groups.google.com/forum/?fromgroups#!topic/symfony-devs/tecj3UOAueM

Unit test results are pending...

Commits
-------

e655120 Enforce sprintf for exceptions
[DependencyInjection] fixed wrong exception class
Merge branch '2.1' into 2.2

* 2.1:
  [DependencyInjection] fixed wrong exception class

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Merge branch '2.2'

* 2.2:
  [DependencyInjection] fixed wrong exception class
  fix overwriting of request's locale if attribute _locale is missing
[DependencyInjection] fixed management of scoped services with an invalid behavior set to null (closes #7636)
fix a DI circular reference recognition bug
merged branch tgabi333/2.1 (PR #7699)

This PR was merged into the 2.1 branch.

Discussion
----------

[DependencyInjection] Fix a DI circular reference recognition bug

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets |
| License       | MIT
| Doc PR        |

plus add ability to detect deeper circular references eg: A -> B -> C -> B

Commits
-------

8a434ed fix a DI circular reference recognition bug
[Config] #7644 add tests for passing number looking attributes as strings
merged branch cordoval/bugfix/7644 (PR #7655)

This PR was squashed before being merged into the 2.2 branch (closes #7655).

Discussion
----------

[Config] #7644 add tests for passing number looking attributes as strings

| Q                       | A                 |
| -----------------  |:-------------:|
| Bug fix?            | yes             |
| New feature     | no               |
| BC breaks?     | no               |
| Deprecations?| no               |
| Tests pass?    | yes             |
| Fixed tickets    | #7644        |
| License            | MIT            |

Commits
-------

d98118a [Config] #7644 add tests for passing number looking attributes as strings
Merge branch '2.1' into 2.2

* 2.1:
  [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
  [BrowserKit] removed dead code
  [HttpFoundation] fixed empty domain= in Cookie::__toString()
  fixed detection of secure cookies received over https
  [Translation] removed an uneeded class property
  [Translation] removed unneeded getter/setter
  [Translator] added additional conversion for encodings other than utf-8
  fix a DI circular reference recognition bug
  [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
Merge branch '2.2'

* 2.2:
  [Config] #7644 add tests for passing number looking attributes as strings
  [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
  [BrowserKit] removed dead code
  [HttpFoundation] fixed empty domain= in Cookie::__toString()
  fixed detection of secure cookies received over https
  [2.2] Pass ESI header to subrequests
  [Translation] removed an uneeded class property
  [Translation] removed unneeded getter/setter
  [Translator] added additional conversion for encodings other than utf-8
  fixed source messages to accept pluralized messages [Validator][translation][japanese] add messages for new validator
  fix a DI circular reference recognition bug
  [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS

Conflicts:
	src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
Fixed PHPDocs
Merge remote-tracking branch 'symfony/master' into develop

Conflicts:
	Tests/Compiler/CheckCircularReferencesPassTest.php
	src/main/php/ehough/iconic/ContainerBuilder.php
	src/main/php/ehough/iconic/compiler/CheckCircularReferencesPass.php
	src/main/php/ehough/iconic/dumper/PhpDumper.php
	src/test/php/ContainerBuilderTest.php
	src/test/php/Fixtures/includes/createphar.php