PIM-3533 Avoid normalizing empty price collections to prevent wrong keys
PIM-3533 Update changelog
Merge pull request #1912 from akeneo/PIM-3533

PIM-3533 Avoid normalizing empty price collections to prevent wrong keys
PIM-3533 Add a migration script for incorrectly built versions
Merge pull request #1917 from akeneo/PIM-3533

PIM-3533 Add a migration script for incorrectly built versions
PIM-3552 Force single result cache per select2 grid filter
Merge pull request #1920 from akeneo/PIM-3552

PIM-3552 Force single result cache per select2 grid filter
PIM-3531: allow to import YAML in files for Behat scenarios
PIM-3531: add a getFilter method for the query filter registry
PIM-3531: fixing CSV import scenarios
Merge pull request #1903 from akeneo/PIM-3535

PIM-3535: allow to import YAML files for Behat, and change filter registry API
Merge branch '1.2' into merge-1218

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/TransformBundle/Normalizer/Flat/ProductValueNormalizer.php
PIM-3533 Allow extra options in denormalizer context
Merge pull request #1922 from akeneo/merge-1218

Merge 1.2.18 fixes on master
Fix CS
PIM-3558 : update the flat value normalizer to order attribute options
for multiselect
Merge pull request #1927 from akeneo/PIM-3558-order-of-options

[SLA] PIM-3558 : update the flat value normalizer to order attribute options
Preparing version 1.2.18
Merge branch 'master' into merge_118

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/CatalogBundle/Version.php
PIM-3558 : re-work the fix to use interfaces and not abstract classes