Scatter conn should wait till rollback completes before return

@alainjobart @sougou