Merge "make_helpers: tbbr: Fix FWU certificate generation" into integration