Merge "BUG-648: include yangtools.util package"