Merge change 6104 into donut

* changes:
  Add a "clear backed-up data" method to the backup mechanism