Fixed PIM-1251
Fixed CS
Merge branch 'fix/PIM-1251'

Conflicts:
	src/Pim/Bundle/GridBundle/Resources/config/services.yml