Pull in the remainder of the changes from Martin's tree for Storage Format 5. Bookmark syncing is disabled for now though.