[master] Merge branch 'trac2136'

Conflicts:
	tests/system/bindctl/nsx1/b10-config.db.template.in

diff --cc configure.ac
Simple merge

diff --cc doc/guide/bind10-guide.html
Simple merge

diff --cc doc/guide/bind10-guide.txt
Simple merge

diff --cc doc/guide/bind10-guide.xml
Simple merge

diff --cc src/bin/bind10/bind10.8
Simple merge

diff --cc src/bin/bind10/bind10.xml
Simple merge

diff --cc src/bin/bind10/bind10_src.py.in
Simple merge

diff --cc src/bin/bind10/tests/bind10_test.py.in
Simple merge

diff --cc tests/system/bindctl/nsx1/b10-config.db.template.in
index 4c0b6dc22b1552c9725c02585b8439254ebd32eb,58ad3771011aceb4b205d37d360944bfd0b45a71..118e53318b2db5b304c94d98ef96301994043b1b
--- 1/tests/system/bindctl/nsx1/b10-config.db.template.in
--- 2/tests/system/bindctl/nsx1/b10-config.db.template.in
+++ b/tests/system/bindctl/nsx1/b10-config.db.template.in
@@@ -4,24 -4,7 +4,27 @@@
     "database_file": "@abs_builddir@/zone.sqlite3",
     "statistics-interval": 1
   },
 + "data_sources": {
 +    "classes": {
 +        "IN": [{
 +            "type": "sqlite3",
 +            "params": {
 +                "database_file": "@abs_builddir@/zone.sqlite3"
 +            }
 +        }]
 +    }
 + },
 + "Logging": {
 +     "loggers": [
 +        {
 +            "name": "*",
 +            "severity": "DEBUG",
 +            "output_options": [],
 +            "debuglevel": 99
 +        }
 +     ]
++ },
+  "Stats": {
+    "poll-interval": 1
   }
  }

diff --cc tests/system/bindctl/tests.sh
Simple merge