Fixed Conflicts:
	src/bin/d2/tests/Makefile.am

Modifiedl D2CfgMgr.configPermutations test to verify that
parsing error messages contain position information.
Fixed format of one error message in D2CfgMgr that didn't
match. Hopefully, Marcin is happy now.

Surrounded position info in error messages with parens.
Replaced use of vector with map for tracking position values.
General cleanup.

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

Added new example files for D2:
	ddns/sample1.json
	ddns/template.json

Added the unit test D2CfgMgrTest.configPermutations to
d2_cfg_mgr_unittests.cc.  This test iterates through the
list of test configurations defined in a specialzed JSON
data file.  It provides a relatively painless way to test
a large number configurations without hard-coding them.

Added the test data file:

It currently contains over sixty tests. The vast majority
of these tests are invalid content tests.

Modified DdnsDomainParser::build to validate parameters and use position
info in error messages.

Modified TSIGKeyInfoParser::build to validate parameters and use position
in error messages.

Parameter "hostname" now throws an "not supported yet" error.  This
can be undone if/when its implmemented.

Port must now be non-zero.

Modified DCfgContextBase::getParam() variants to return the parameter's
Element::Position.  This makes it available during parsing.

Modified TSIGKeyInfoParser::build to validate parameters and use position
in error messages.

D2CfgMgr::buildParams now validates all of the
top level params prior to calling the D2Params
constructor.  This allows element position info
to be included in error logging.