[master] Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

src/lib/config/tests/fake_session.cc

@@ -52,16 +52,14 @@ listContains(ConstElementPtr list, ConstElementPtr el) {
 
 void
 listRemove(ElementPtr list, ConstElementPtr el) {
-    int i = -1;
+    int i = 0;
     BOOST_FOREACH(ConstElementPtr s_el, list->listValue()) {
         if (*el == *s_el) {
-            i = 0;
+            list->remove(i);
+            return;
         }
         i++;
     }
-    if (i >= 0) {
-        list->remove(i);
-    }
 }
 // endwant