Merge pull request #982 from akeneo/fix/attribute_option

Added constraint on attributeOption
Replace Process with simple exec

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Controller/JobProfileController.php
Fix on metric validator
Merge pull request #1040 from akeneo/fix/metric_validator

Fix on metric validator
Ease the overriding of mapping in ORM PQB
Ease the overriding of ORM PQB
Remove unused variable
Update the changelog
Merge branch 'master' into refactor/ease_pqb_customization
Merge pull request #1043 from akeneo/refactor/ease_pqb_customization

[WIP] Ease pqb customization
Rename flexibleRepository property by productRepository in UT
Add missing translation keys
Corrected bug whene importing options with bad atttributes
Merge branch '1.0' into 1.1
Merge branch '1.1'

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Controller/JobProfileController.php
Update platform reference
Update platform ref
Allow filtering by list of values for identifier attribute
Allow filtering by a list of values for identifier attribute in mongo
PIM-2499 : add missing grid translation keys