Merge "Bug 7432 - eliminate use of yang-parser-impl internals"