Merge change 8566

* changes:
  First real cut of bookmarks backup agent