adjust pkg/util for upstream changes#4

soltysh merged 1 commit intosoltysh:rebase_1.8.1soltysh/origin:rebase_1.8.1from

mfojtik:rebase-1.8.1-pkgutilmfojtik/origin:rebase-1.8.1-pkgutilCopy head branch name to clipboard