Merge branch 'master' into trac2106

diff --cc src/lib/datasrc/rbtree.h
index 6a86524dd511933ef4d976fb4fe169103d64cc66,771f23e3c8da347d8fbf4ac7281e5a48e0be3d91..38086db235647866d778786016e7ce990945c05b
--- 1/src/lib/datasrc/rbtree.h
--- 2/src/lib/datasrc/rbtree.h
+++ b/src/lib/datasrc/rbtree.h
@@@ -1345,9 -1322,9 +1355,9 @@@ RBTree<T>::find(const isc::dns::LabelSe
  
      RBNode<T>* node = root_.get();
      Result ret = NOTFOUND;
 -    dns::LabelSequence target_labels(target_name);
 +    dns::LabelSequence target_labels(target_labels_orig);
  
-     while (node != NULLNODE) {
+     while (node != NULL) {
          node_path.last_compared_ = node;
          node_path.last_comparison_ = target_labels.compare(node->getLabels());
          const isc::dns::NameComparisonResult::NameRelation relation =

diff --cc src/lib/datasrc/tests/rbtree_unittest.cc
Simple merge