PIM-3282: fix the grid filters that can be set as json in the request
Merge pull request #1678 from akeneo/PIM-3282

PIM-3282: fix the grid filters that can be set as json in the request
Preparing version 1.2.9
Merge pull request #1680 from akeneo/version-1-2-9

Preparing version 1.2.9
PIM-3221: Fix bug on variant group import

*Fix bug on variant group import, possibility to update variant
groups's attributes on import and it shouldn't be possible (currently it display a
error message)

*Improved the behats
Merge pull request #1690 from akeneo/PIM-3221

PIM-3221: Fix bug on variant group import
Merge branch 'master' into PIM-3221-master

Conflicts:
	src/Pim/Bundle/CatalogBundle/Validator/Constraints/ImmutableValidator.php
	src/Pim/Bundle/CatalogBundle/Version.php
Fix conflict CHANGELOG.md
PIM-3283: Password reset does not work
Merge pull request #1692 from akeneo/PIM-3283

PIM-3283: Password reset does not work
Merge branch 'master' into PIM-3283-master

Conflicts:
	src/Pim/Bundle/CatalogBundle/Validator/Constraints/ImmutableValidator.php
	src/Pim/Bundle/CatalogBundle/Version.php
	src/Pim/Bundle/UserBundle/DependencyInjection/PimUserExtension.php
Merge pull request #1691 from akeneo/PIM-3221-master

Pim 3221 master
Merge branch 'master' into PIM-3283-master
Merge pull request #1694 from akeneo/PIM-3283-master

Pim 3283 master
PIM-3209: Fix import running even with wrong file

*Added verification of the file extention before the launch of the job
*Added new behats in order to verify that the file extention is allowed or not
Merge pull request #1695 from akeneo/PIM-3209

PIM-3209: Import is running when we use upload and import with a file with wrong extension
PIM-3250 : re-work PQB, filter and sorter interfaces to deal with locale
and scope context
PIM-3250 : update filter and sorter methods to pass context
PIM-3250 : update mongodb filters and sorters
PIM-3250 : add default locale and scope in product query builder and
factory