Conflicts:
	ChangeLog
	configure.ac
	src/bin/cmdctl/Makefile.am
	src/bin/cmdctl/botan-certgen.cc
	src/bin/cmdctl/tests/Makefile.am
	src/bin/cmdctl/tests/botan-certgen_test.py
	src/bin/d2/tests/Makefile.am
	src/bin/d2/tests/d2_test.py
	src/bin/dhcp4/tests/Makefile.am
	src/bin/dhcp6/tests/Makefile.am
	src/bin/tests/process_rename_test.py.in

Fixed Mac OS-X/gcc 4.2.1 issued warning on empty bodied
while-loops in new asiolink::IntervalTimer unit tests.

 - cosmetic changes in configure.ac
 - comment in src/lib/testutils/testdata/Makefile.am updated

Conflicts:
	ChangeLog
	doc/guide/bind10-guide.xml

D2 unit test IOSignalTest::hammer was scaled back to accomodate
sluggish VMs.  IOSignaTest::mixedSignals was failing intermittently on
NetBSD VM and was rewritten to test the quantity of signals received
rather than the order.

The unittests IntervalTimerTest.intervalModeTest and
IntervalTimerTest.timerReuseTest were failing under NetBSD VM.
They have been restructured to be less susceptible to timing.

There is a new function used in keactrl tests which waits for the server
to shutdown, rather than check if it is down already. This is to avoid
race condition when the process may not completely terminate when we
check that it is.

 - example config files are now installed
 - example in section 5.2 configures persistent database

As part of merging 3407, D2's shell script tests were
revamped to match work done under 3422.

Merge in D2 signal handling.

Added missing parameter and method commentary.
Extended unit tests as suggested.
Moved onreceipt_handler_ from SignalSet to
anonymous namespace.

distcheck was failing to tests/dhcp(4/6)_process_tests.sh.
Since these files are now constructed from a .in file,
they must be pathed in abs_builddir.
dhcp(4/6)/tests/Makefile.am updated.