Revert "Revert "Add CMBugreport to manifest""

This reverts commit 9d3216d672960a06034925e732c7bf99fb53db06.