Fix phpcs
Merge branch 'master' into update_bap_beta

Conflicts:
	src/Pim/Bundle/CatalogBundle/Controller/VariantGroupController.php