[master] Merge branch 'trac3436'

Fixed Conflicts:
	src/bin/d2/tests/Makefile.am

diff --cc src/bin/d2/tests/Makefile.am
index e21d2b4bd760caaae2f5dda67b80df71088a377c,ed510a536a1510dd5db84953dbd3e3fb349cd4bc..417f1903367dcabcca2ed69465bbdfb30a23883a
--- 1/src/bin/d2/tests/Makefile.am
--- 2/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@@ -7,10 -10,28 +7,11 @@@ endi
  
  noinst_SCRIPTS = d2_process_tests.sh
  
 -EXTRA_DIST  = $(PYTESTS)
 -EXTRA_DIST += d2_process_tests.sh.in
 +EXTRA_DIST  = d2_process_tests.sh.in
+ EXTRA_DIST += testdata/d2_cfg_tests.json
  
 -# Explicitly specify paths to dynamic libraries required by loadable python
 -# modules. That is required on Mac OS systems. Otherwise we will get exception
 -# about python not being able to load liblog library.
 -LIBRARY_PATH_PLACEHOLDER =
 -if SET_ENV_LIBRARY_PATH
 -LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/util/threads/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/util/io/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)
 -endif
 -
  # test using command-line arguments, so use check-local target instead of TESTS
  check-local:
 -      for pytest in $(PYTESTS) ; do \
 -      echo Running test: $$pytest ; \
 -      PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_srcdir)/src/bin:$(abs_top_builddir)/src/bin/bind10:$(abs_top_builddir)/src/lib/util/io/.libs \
 -      B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
 -      $(LIBRARY_PATH_PLACEHOLDER) \
 -              $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 -      done
 -
        for shtest in $(SHTESTS) ; do \
        echo Running test: $$shtest ; \
        export B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir); \