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
Merge branch 'PIM-3282-stable' into PIM-3282

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/CatalogBundle/Version.php