CORE-4912: Removed 'argument option' fields from selection type prop editors
Merge branch 'master' into STABLE