Getting the fixed editor wont be useful if you need to add a module, you can use 2.1/HEAD (which already removed placeholders) or remove manually the placeholders and anything you do not use from the manifest template in your version's source code.
And yes, these things fit, just remove the permissions you are not using.
The template is
Here are details on how to fix it:
There is also a "permission fixer" tool, but I have not tried it: