PIM-2166: Fix remove option issue
Merge branch '1.0' of github.com:akeneo/pim-community-dev into 1.0