Have merge threads concentrate on separate generations.

I have opened this pull request to run this change through testing and to make it easier to see.  There is no need to review or merge until we have more results from testing with Riak.

Thanks!