PIM-3229 Display choice attribute values with missing translations in the grid
Merge pull request #1745 from akeneo/PIM-3229

PIM-3229 Display choice attribute values with missing translations in the grid
 PIM-3309 : update changelog
PIM-3229 Fix behat scenario
PIM-3288: fix memory leak on product import
Merge pull request #1751 from akeneo/PIM-3288-stable

PIM-3288: fix memory leak on product import
Merge branch '1.2' into PIM-3288-merge

* 1.2:
  PIM-3288: fix memory leak on product import
  PIM-3229 Fix behat scenario
  PIM-3309 : update changelog
  PIM-3229 Display choice attribute values with missing translations in the grid

Conflicts:
	CHANGELOG.md
	features/product/display_attributes_in_the_grid.feature
PIM-3363 : provide interfaces to normalize managers
PIM-3363 : normalize attribute and option manager

Conflicts:
	src/Pim/Bundle/CatalogBundle/Manager/AttributeManager.php
PIM-3363 : normalize attribute manager
PIM-3363 : rename updater and bulk updater interfaces
PIM-3363 : normalize attribute group manager
PIM-3363 : product manager now implements remover interface
PIM-3363 : normalize association type manager
PIM-3363 : normalize category manager
PIM-3363 : category manager implements saver interface
PIM-3363 : normalize the datagrid view manager
PIM-3363: implement saver and remover interfaces for managers
PIM-3363 : fix datagrid view remove method
PIM-3363 : normalize association type handler