PIM-3141: Twig modifications
Merge pull request #1459 from akeneo/PIM-3141

PIM-3141: Twig modifications