Merge "Add adjust of odlparent version in yangtools"