Fix regression with ADD of tar files

Fixes #4126
Fixes #4005

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)