Fix test failures
After syncing with RDS, update the timestamp when necessary.
Fix test failures due to updated timestamps
Add handling MultipleParentsException to create() and update()
Add repair()
Merge pull request #518 from eric-wu/develop

Better handling of timestamps and multiple parents