Conflicts from I36d45a03 are resolved using the copy in the master
branch; see that change for more context.
Merge stable-3.0 into master in delete-project plugin as well.
* stable-3.0:
Add delegate factory and instance methods introduced in master
Update git submodules
Remove unused LICENSE-codemirror-original
Change-Id: I90b3e4b4021af39f0175d30f816010ad8076f5a0