[nsec_merge] Merge branch 'trac1807' into nsec_merge

Conflicts:
	src/lib/datasrc/tests/rbtree_unittest.cc

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

diff --cc src/lib/datasrc/rbtree.h
Simple merge

diff --cc src/lib/datasrc/tests/rbtree_unittest.cc
index 84e17457704227648841eca8a4a50e43b4177ae5,c8858f73f8b699a69a15f5dbcf33ef157a17fa39..25eafb4c6a199250c8279d6daa7763baf903e99d
--- 1/src/lib/datasrc/tests/rbtree_unittest.cc
--- 2/src/lib/datasrc/tests/rbtree_unittest.cc
+++ b/src/lib/datasrc/tests/rbtree_unittest.cc
@@@ -443,10 -440,9 +438,9 @@@ TEST_F(RBTreeTest, previousNode) 
          // If we start at the lowest (which is "a"), we get to the beginning
          // right away.
          EXPECT_EQ(RBTree<int>::EXACTMATCH,
-                   rbtree.find<void*>(Name(names[0]), &node, node_path, NULL,
-                                      NULL));
+                   rbtree.find(Name(names[0]), &node, node_path));
          EXPECT_NE(static_cast<void*>(NULL), node);
 -        EXPECT_EQ(NULL, rbtree.previousNode(node_path));
 +        EXPECT_EQ(static_cast<void*>(NULL), rbtree.previousNode(node_path));
          node = NULL;
          node_path.clear();
      }