Merge "bug 1957 StackOverFlowError in YangParserImpl"