Fixed line lengths of merger serializer.
Added merger_serializer_t::unhandled_index_write_waiter_exists.
Removed some more trailing whitespace.
Merge branch 'next' into sam_merger_fix