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
Merge pull request #1691 from akeneo/PIM-3221-master

Pim 3221 master
Merge branch 'master' into PIM-3283-master