Backport docs/extension.schema.v2.json fixes