Merge branch 'trac2852_3'

Conflicts:
	src/lib/datasrc/client_list.h

diff --cc src/lib/datasrc/client_list.cc
Simple merge

diff --cc src/lib/datasrc/client_list.h
index 1887ed73d65a246ce8cffb7a191862418adf7ea5,f94493caf21ac784ac96f6d14f71e2c33d764dc9..7917f3f04fb289bfef4314352eb82fed487b648b
--- 1/src/lib/datasrc/client_list.h
--- 2/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@@ -21,8 -21,7 +21,8 @@@
  #include <dns/rrclass.h>
  #include <cc/data.h>
  #include <exceptions/exceptions.h>
- #include "memory/zone_table_segment.h"
+ #include <datasrc/memory/zone_table_segment.h>
 +#include <datasrc/zone_table_accessor.h>
  
  #include <vector>
  #include <boost/shared_ptr.hpp>

diff --cc src/lib/datasrc/tests/client_list_unittest.cc
index 2701f39881b9c4206bd919d9aebfe1a9d6b405be,fcf66207db848f24ee3b5bc762ef2c37354d91e1..a686aee0ef1bb29f03036992f44bf258ae6621d8
--- 1/src/lib/datasrc/tests/client_list_unittest.cc
--- 2/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@@ -832,10 -910,9 +924,10 @@@ TEST_P(ListTest, names) 
                   ConfigurableClientList::ConfigurationError);
  }
  
- TEST_F(ListTest, BadMasterFile) {
+ TEST_P(ListTest, BadMasterFile) {
      // Configuration should succeed, and the good zones in the list
 -    // below should be loaded. No bad zones should be loaded.
 +    // below should be loaded.  Bad zones won't be "loaded" in its usual sense,
 +    // but are still recognized with conceptual "empty" data.
      const ConstElementPtr elem(Element::fromJSON("["
          "{"
          "   \"type\": \"MasterFiles\","