Added merger_serializer_t::unhandled_index_write_waiter_exists.
Merge branch 'sam_merger_fix' into sam_97_alt

Conflicts:
	src/serializer/merger.cc
Removed some more trailing whitespace.
Merge branch 'sam_merger_fix' into sam_97_alt