Merge pull request #1663 from akeneo/PIM-3266

PIM-3266: do not flush skipped items during an import
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-3282: fix the grid filters that can be set as json in the request
Preparing version 1.2.9
PIM-1154: Changed grid no results message on search
Merge branch 'PIM-3282-stable' into PIM-3282

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/CatalogBundle/Version.php
Merge pull request #1687 from akeneo/PIM-1154

PIM-1154: Changed grid no results message on search
Merge pull request #1688 from akeneo/PIM-3282

PIM-3282: fix the grid filters that can be set as json in the request
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