Merge "Fix errors reported by pyang"