removed unused code
Passed the config when building the Configuration in ConfigurableExtension
Replace romaji period characters with Japanese style zenkaku period characters

Found 4 of the Japanese translations inconsistently used romaji style periods. Replaced with zenkaku periods.
merged branch wwotoole/patch-1 (PR #8400)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8400).

Discussion
----------

Replace romaji period characters with Japanese style zenkaku period char...

...acters

Found 4 of the Japanese translations inconsistently used romaji style periods. Replaced with zenkaku periods.

Commits
-------

1b3b1a7 Replace romaji period characters with Japanese style zenkaku period characters
merged branch stof/config_argument (PR #8359)

This PR was merged into the 2.2 branch.

Discussion
----------

Passed the config when building the Configuration in ConfigurableExtension

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

This passes the config to ``getConfiguration`` instead of passing an empty array in ConfigurableExtension. This makes the class usable for bundle overwriting the ``getConfiguration`` method to use the config instead of using the default logic (which does not need the config).

Commits
-------

a830001 Passed the config when building the Configuration in ConfigurableExtension
[WebProfiler] fix content-type parameter
[DI] Fixed bug requesting non existing service from dumped frozen container
merged branch WouterJ/di_alias_dumper_bug (PR #8435)

This PR was squashed before being merged into the 2.3 branch (closes #8435).

Discussion
----------

[DI] Fixed bug requesting non existing service from dumped frozen container

When dumping a frozen container without aliases, the method `Container::has()` will throw a *"Warning: array_key_exists() expects parameter 2 to be array, null given"* warning. It's because `PhpDumper::addAliases` returns `''` if no aliases are given. This will work for a normal constructor, because it calls the `Container::__construct` method, but the frozen constructor doesn't do that. So it requires a `$this->aliases = array();` in the constructor.

This PR fixes this bug (and adds the test). Bug is introduced in #8252 and 63367a3d5615ff65251ccee4f73223107275f65f

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

Commits
-------

8bb4e4d [DI] Fixed bug requesting non existing service from dumped frozen container
CookieJar remove unneeded var, Client remove unneeded else
merged branch entering/browser-kit-beautify-code (PR #8432)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8432).

Discussion
----------

[BrowserKit] CookieJar remove unneeded var, Client remove unneeded else

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

Commits
-------

10c6799 [BrowserKit] CookieJar remove unneeded var, Client remove unneeded else
[HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
merged branch fabpot/removed-unused-code (PR #8440)

This PR was merged into the 2.3 branch.

Discussion
----------

removed unused code

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

Commits
-------

c60bdf5 removed unused code
merged branch fabpot/render-objects-fix (PR #8438)

This PR was merged into the 2.2 branch.

Discussion
----------

Render objects fix

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

Commits
-------

82dbaee [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
Update JsonResponse.php

Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS.
merged branch esgy/patch-1 (PR #8420)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8420).

Discussion
----------

Update JsonResponse.php

Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS.

Commits
-------

2b1c973 Update JsonResponse.php
fix handling of a default 'template' as a string
Merge branch '2.2' into 2.3

* 2.2:
  Update JsonResponse.php
  [HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
  [WebProfiler] fix content-type parameter
  Replace romaji period characters with Japanese style zenkaku period characters
  Passed the config when building the Configuration in ConfigurableExtension

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml
	src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
Comment fixed: RedrawFrequency is measured in steps.
ProgressHelper shows percentage complete.

In the past the value was rounded, the progressbar ended up being 100% for 0.5%
of the total execution time. That means 18 seconds on a 1 hour process.
merged branch lsmith77/fix_include_default_text (PR #8445)

This PR was merged into the 2.2 branch.

Discussion
----------

Fix include default text

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=fix_include_default_text)](https://travis-ci.org/lsmith77/symfony)
Fixes the following tickets: -
License of the code: MIT

Commits
-------

9d1004b fix handling of a default 'template' as a string