Conflicts:
	src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
	src/lib/dns/tests/rdata_nsecbitmap_unittest.cc

Conflicts:
	src/lib/datasrc/database.cc

valgrind reported an invalid D2ClientMgr is destroyed while in send mode
Added call to stopSender to D2ClientMgr destructor.

Unit test was failing as a closed fd passed to select() does not fail
on all OSs.  Changed the test so it verifies that the fd in question
no longer evaluates to ready to ready.

Integrates use of NameChangeUDPSender in D2ClientMgr.

Conflicts:
	ChangeLog

Conflicts:
	ChangeLog
	src/bin/dhcp4/dhcp4_srv.cc
	src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
	src/bin/dhcp4/tests/dhcp4_test_utils.h
	src/lib/dhcpsrv/cfgmgr.cc
	src/lib/dhcpsrv/cfgmgr.h

Master updated while merging in 3299.

Also ran dhcp_ddns_messages.mes through reorder tool.

This prevents errors reported by valgrind about uninitialized value of
hops being used in unit tests which skip parsing the packet. Okayed
on jabber.

b10-dhcp-ddns uses lease length as TTL in DNS update RRsets.

Shored up the error handling in the sender when the WatchSocket fails to mark
or clear. Addes unit tests accordingly.

 - getRelayInfo() implemented, relay_ is now protected
 - setRelay => setRelayInfo
 - Option::Universe is passed as const reference
 - Further clarified white_list_ field in Subnet.h

Conflicts:
	src/bin/dhcp4/tests/fqdn_unittest.cc

Fixed a couple doxgyen errors and removed the commented
out include of ioctl.h in d2_upd_unittest.cc