When converting an opaque directory always keep the original directory tar entry to ensure directory is created with correct permissions on restore. Closes #27298 Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan) Upstream-commit: daa70195171d798cdfb6c4033b33a06a8f7ebe6c Component: engine