Merge "Fixed bugs in parsing enumeration, augment, identity. Refactored SchemaPath...