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

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