[Validator][translation][japanese]replaced period to japanese one
[Validator][translation][japanese]fixed japanese translation to more practical one
[Validator][translation][japanese]fixed message ordering to be consistent with other languages
[Validator][translation][japanese]added new validation messages in japanese translation
merged branch 77web/validator-translation-ja (PR #7478)

This PR was merged into the 2.1 branch.

Discussion
----------

[Validator] [translation] updated Japanese translation for Validator component

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

I will also update translations for new messages available after 2.2 once this request is merged.

Commits
-------

987aded [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
Keep the file extension in the temporary copy and test that it exists (closes #7482)
Fixed long multibyte parameter logging in DbalLogger:startQuery
merged branch burci/doctrinebridge-dballogger-bug (PR #7497)

This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][2.2][2.3][Bridge][Doctrine] Fixing long multibyte parameter logging in DbalLogger:startQuery

See #7484

Commits
-------

64a1d39 Fixed long multibyte parameter logging in DbalLogger:startQuery
[Security] Removed unused var
fix overwriting of request's locale if attribute _locale is missing
 idAsIndex should be true with a smallint or bigint id field.
[SecurityBundle] Fixed configuration exemple

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
small changes
Doctrine cannot handle bare random non-utf8 strings
On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var.
merged branch webfactory/fix-finder-test-osx (PR #7536)

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

Discussion
----------

Fix Finder tests on OS X

... where sys_get_temp_dir() does not return a realpath().

Commits
-------

0ed8441 On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var.
merged branch TerjeBr/persistent-token-provider (PR #7534)

This PR was merged into the 2.2 branch.

Discussion
----------

[Security/Http/RememberMe] PersistentTokenBasedRememberMeServices bugfix

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

The database and debug layer cannot handle raw random strings. It may contain invalid ut8 characters and whatnot. So, in order to avoid a lot of database bugs, we must base64_encode the random strings.

Commits
-------

751abe1 Doctrine cannot handle bare random non-utf8 strings
merged branch bamarni/minor-2.1 (PR #7533)

This PR was merged into the 2.1 branch.

Discussion
----------

small changes

Commits
-------

766e880 small changes
merged branch lyrixx/fix-security-config (PR #7528)

This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][SecurityBundle] Fixed configuration exemple

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

Commits
-------

2c7a99b [SecurityBundle] Fixed configuration exemple
merged branch sterrien/patch-4 (PR #7519)

This PR was merged into the 2.1 branch.

Discussion
----------

[Form] [Doctrine] [EntityChoiceList] idAsIndex should be true with a smallint id field.

When the id of an entity is a smallint, $this->idAsIndex should also be true.
It was not the case.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: should
License of the code: MIT

Commits
-------

673fd9b  idAsIndex should be true with a smallint or bigint id field.
fixed doc references (closes #7515)
merge branch '2.1' into 2.2

* 2.1:
  fixed doc references (closes #7515)
  small changes
  [SecurityBundle] Fixed configuration exemple
  idAsIndex should be true with a smallint or bigint id field.
  Fixed long multibyte parameter logging in DbalLogger:startQuery
  Keep the file extension in the temporary copy and test that it exists (closes #7482)
  [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation

Conflicts:
	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
fixed doc references (closes #7515)