A fix for #1670
Adjusted the limit on the free coro list (given that it is a per-thread limit)
Merge branch 'next' into daniel_1670
Fix behavior in case of vector clock conflicts on replicas/acks
Rename vector clock conflict + add comment
Fix grammar mistake
Merge branch 'next' into daniel_1670
Merge branch 'daniel_1670' into next
Merge branch 'michel_1814_conflicts' into next
Merge branch 'next' into sam_alt