[master] Merge branch 'trac5016'

diff --cc AUTHORS
Simple merge

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

diff --cc src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
Simple merge

diff --cc src/lib/dhcp/Makefile.am
index 5b49a70ace71b67f83bed7ee2bef73d766cf9a32,199e34071fa7a8591854c1e0712afd2848a79adf..b3cdbc15886e3a39317c68212a30456008e3b07d
--- 1/src/lib/dhcp/Makefile.am
--- 2/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@@ -28,7 -25,14 +28,8 @@@ libkea_dhcp___la_SOURCES += option6_cli
  libkea_dhcp___la_SOURCES += option6_ia.cc option6_ia.h
  libkea_dhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h
  libkea_dhcp___la_SOURCES += option6_iaprefix.cc option6_iaprefix.h
 -libkea_dhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h
 -libkea_dhcp___la_SOURCES += option6_client_fqdn.cc option6_client_fqdn.h
+ libkea_dhcp___la_SOURCES += option6_pdexclude.cc option6_pdexclude.h
  libkea_dhcp___la_SOURCES += option6_status_code.cc option6_status_code.h
 -libkea_dhcp___la_SOURCES += option_vendor.cc option_vendor.h
 -libkea_dhcp___la_SOURCES += option_vendor_class.cc option_vendor_class.h
 -libkea_dhcp___la_SOURCES += option_int.h
 -libkea_dhcp___la_SOURCES += option_int_array.h
  libkea_dhcp___la_SOURCES += option.cc option.h
  libkea_dhcp___la_SOURCES += option_custom.cc option_custom.h
  libkea_dhcp___la_SOURCES += option_data_types.cc option_data_types.h