Updated changelog
Fixed CS
Merge branch 'feature/PIM-1740' into task/PIM-1723

Conflicts:
	src/Pim/Bundle/ImportExportBundle/Transformer/ORMTransformer.php