fix merge conflicts

This is for ticket 2945.
Don't use grep -q (not portable).
Also use quotes around "$werror_ok" just in test just in case is unset.

No changelog message as it appears it worked before but was just noisy.

Conflicts:
	src/bin/dhcp4/dhcp4_srv.cc
	src/bin/dhcp4/tests/dhcp4_test_utils.h
	src/bin/dhcp6/dhcp6_srv.cc
	src/lib/dhcp/pkt4.cc
	src/lib/dhcp/tests/pkt4_unittest.cc

 - Dhcpv{4,6}Srv::classifyPacket() is now better commented.
 - constants are now used instead of magic numbers
 - Pkt{4,6}::addClass is now better commented

Conflicts:
	src/lib/dhcp/iface_mgr.cc

On sluggish machines D2UpdateMgrTest.multiTransactionTimeout
failed intermittantly. A run-away test check was a bit too
stringent.

Adds support for DHCP-DDNS configuration parameters to b10-dhcp4.

Refactored some unit test classes in src/bin/d2/tests

Forgot to document params to doOneExchange.

Changed IP addresses used in tests in dhcp_parsers_unittest.cc
to comply test values recommened by RFCs.

Added missing test method commentary.

Conflicts:
	ChangeLog

Conflicts:
	src/lib/dhcp/iface_mgr.cc
	src/lib/dhcp/iface_mgr.h
	src/lib/dhcp/tests/iface_mgr_unittest.cc

Updated date in copyright header and reworded one message.

Many lines too long.
Use a tab before the keyword type.
Use two tabs before the committer username.

This was not reviewed. No content change.

I added spaces after commas also to be consistent
and to be a little more readable.
This was not reviewed as is minor.

Updated test fixture classes in src/bin/d2/tests/nc_add_unittests.cc and
nc_trans_unittests.cc to derive from TransactionTest.