PIM-3357 Don't remove attribute options when cancelling modifications
Merge pull request #1849 from akeneo/PIM-3357

PIM-3357 Don't remove attribute options when cancelling modifications