PIM-2166: Fix remove option issue
PIM-2166: Update CHANGELOG.md
Merge branch 'master' into fix/PIM-2166

Conflicts:
	CHANGELOG.md
PIM-2166: Update changelog
PIM-2166: Create scenario for fix
PIM-2166: Add more comments
PIM-2166: Clean features
Merge pull request #825 from akeneo/fix/PIM-2166

PIM-2166: No way to delete an attribute option