Merge changes I215a84bd,I83710d84 into integration

* changes:
  perf(cpus): reduce the footprint of errata reporting
  refactor(cpus): make errata reporting more generic