Remove use of pkg/integration in pkg/idtools Upstream-commit: ffccf2cab95e05d5c5a883bfe3475ee65a84b16c Component: engine