Enable test_rollback after bug fix
Merge pull request #119 from youtube/liguo

Enable test_rollback after bug fix
Merge branch 'master' into resharding