Merge "Remove deadcode that supported non-zipped bugreports"