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 branch 'master' into PIM-3283-master
Merge pull request #1694 from akeneo/PIM-3283-master

Pim 3283 master