Scatter conn should wait till rollback completes before return
Merge pull request #116 from youtube/liguo

Scatter conn should wait till rollback completes before return