Use original_filename, if available, for name of content file in zip arc...

...hive

Fixes #864