Avoid locked options to be selected and deleted.
Merge pull request #1684 from jdecuyper/feature-avoid-removal-of-locked-options

Avoid locked options to be selected and deleted.