Merge change 2420 into donut

* changes:
  This just makes it easier to derive from ApplicationErrorReport.