PIM-2817: Fix behat scenarios
Merge branch 'master' of git://github.com/akeneo/pim-community-dev