Merge "fix(cpus): add missing add_erratum_entry" into integration