Merge "BUG-994: remove open-coded SchemaPath.createChild"