Fixes a problem with how we count num_active_writes in the merger serializer.
Merge branch 'daniel_1471' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next