Merge "BUG-994: do not use SchemaPath.getPath()"