[2219] Merge branch 'trac2218' into trac2219

diff --cc src/lib/datasrc/memory/memory_client.cc
Simple merge

diff --cc src/lib/datasrc/memory/memory_client.h
Simple merge

diff --cc src/lib/datasrc/memory/tests/memory_client_unittest.cc
Simple merge