Intent metamodel refactoring: Step 2.2

- Update .edit plugin to obtain previous behavior
65 files changed