Fix issue where filesystem path was added to all-attachments (zip) file (#1489507)
CS fixes