[master] Merge branch 'trac3715'

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

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

diff --cc src/bin/perfdhcp/test_control.cc
Simple merge

diff --cc src/lib/dhcp/iface_mgr.h
Simple merge

diff --cc src/lib/dhcp/iface_mgr_bsd.cc
Simple merge