Merge branch 'trac1485'

diff --cc src/lib/asiolink/io_address.h
Simple merge

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

diff --cc src/lib/dhcpsrv/cfgmgr.cc
Simple merge

diff --cc src/lib/dhcpsrv/d2_client.cc
Simple merge

diff --cc tests/tools/perfdhcp/test_control.cc
Simple merge