fix regressions after merge

- conflict at modifier non-sealed vs callin modifiers
- copy OT-additions to TypeDeclaration.PROPERTY_DESCRIPTORS_15 (dom)
3 files changed