[master] Merge branch 'trac3983' (Decline parameters in v4 and v6)

diff --cc src/bin/dhcp4/tests/Makefile.am
Simple merge

diff --cc src/bin/dhcp6/json_config_parser.cc
Simple merge

diff --cc src/bin/dhcp6/tests/Makefile.am
index e8f595e7e4337f6bb827a3f5c9c2a791dc986117,61e1624e458ec8a4e7884d252e97ff6a91fc5e02..9ee118991b1494621bb87b25303524a34e1735df
--- 1/src/bin/dhcp6/tests/Makefile.am
--- 2/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@@ -20,8 -20,10 +20,9 @@@ check-local
  AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
  AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header
  AM_CPPFLAGS += -I$(top_srcdir)/src/bin
+ AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
  AM_CPPFLAGS += -DTOP_BUILDDIR="\"$(top_builddir)\""
  AM_CPPFLAGS += $(BOOST_INCLUDES)
 -AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\"
  AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/dhcp6/tests\"
  AM_CPPFLAGS += -DINSTALL_PROG=\"$(abs_top_srcdir)/install-sh\"
  

diff --cc src/lib/dhcpsrv/Makefile.am
Simple merge