Merge change 777 into donut

* changes:
  Rewrite SyncStorageEngine to use flat files and in-memory data structures.