Compiles, but tests don't pass. There's something rotten in there.

Conflicts:
	src/lib/datasrc/memory/memory_client.cc
	src/lib/datasrc/memory/memory_client.h
	src/lib/datasrc/memory/zone_table_segment_local.h
	src/lib/datasrc/tests/memory/memory_client_unittest.cc
	src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc