[DependencyInjection] fixed wrong exception class
merged branch fabpot/inactive-scope-fix (PR #7696)

This PR was merged into the 2.1 branch.

Discussion
----------

[DependencyInjection] fixed wrong exception class

| 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

Commits
-------

22bf965 [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
fixed source messages to accept pluralized messages [Validator][translation][japanese] add messages for new validator
merged branch 77web/validator-translation-ja-2.2plus (PR #7718)

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

Discussion
----------

[2.2+][Validator][translation] update Japanese translation for Validator component

| Q             | A
| ------------- | ---
| Fixed tickets | N/A
| License       | MIT

Commits
-------

4ea64cd [Validator][translation][japanese] fixed source messages to accept pluralized messages [Validator][translation][japanese] add messages for new validator