Fix locale activation
Fix behat test
PIM-1611 Fix the case with empty attribute options
Merge branch 'master' into flexibleentity