Merge "Set last modified timestamp for the bugreport entry in the zipped file...

Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev