Merge change 2831 into donut

* changes:
  Fix ChangeLog, since we're rebuilding 1.5_r1, no need to list previous changes.