Bug 1093337 - Come up with a better naming schema for attachments
Merge bug_1093337_attachment_names into integration-master