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-3288: Clean the category entity to remove unsused product addition/deletion methods
Merge branch 'master' into PIM-3288-merge

* master: (30 commits)
  PIM-3363 : add saving options when adding and removing attribute to a product
  PIM-3364 : add missing update in changelog
  PIM-3364 : fix circular reference in Mongo completeness generator
  PIM-3364 : replace channel manager unit test by specs
  PIM-3364 : fix channel manager and completeness scheduling
  PIM-3364 : cosmetic in handlers
  PIM-3364 : cosmetic in product controller
  PIM-3364 : remove object manager from product builder
  PIM-3364 : inject completeness manager to channel manager
  PIM-3364 : normalize group type and group handlers
  PIM-3364 : fixcs
  PIM-3364 : normalize form handlers
  PIM-3363 : fix cs
  PIM-3363 : fix handlers and missing saves
  PIM-3363 : normalize comment manager
  PIM-3363 : normalize exceptions
  PIM-3363 : normalize exceptions
  PIM-3363 : normalize association type handler
  PIM-3363 : fix datagrid view remove method
  PIM-3363: implement saver and remover interfaces for managers
  ...

Conflicts:
	CHANGELOG.md
Merge pull request #1762 from akeneo/PIM-3288-merge

Pim 3288 merge