Merge "Reject zip files that have trailing bytes after their CD."