PIM-2553: Fix refactoring on some conditions
Merge branch 'master' of git://github.com/akeneo/pim-community-dev