Signed-off-by: Michael Crosby <crosbymichael@gmail.com> Conflicts: pkg/archive/archive.go pkg/chrootarchive/archive.go Upstream-commit: 313a1b7620910e47d888f8b0a6a5eb06ad9c1ff2 Component: engine