Merge "Added metadata entries to zipped bugreport:"