PIM-2210 Merged localizable and scopable listeners
Merge branch 'master' into pim-2210

Conflicts:
	src/Pim/Bundle/CatalogBundle/Resources/config/storage_driver/doctrine/orm.yml
Merge pull request #858 from akeneo/pim-2210

PIM-2210 Merge common ODM and ORM listeners