Signed-off-by: Tibor Vass <teabee89@gmail.com> Conflicts: pkg/archive/archive.go fixed conflict which git couldn't fix with the added BreakoutError Conflicts: pkg/archive/archive_test.go fixed conflict in imports Upstream-commit: 221617dbcd9431f14a3779d8bac9aba52f78ea21 Component: engine