[2307] makefile generate manual and add start of perfdhcp man page
[2307] fix typo in misspelling in usage output
[2307] add command-line options

This is not formatted or organized yet.
[2307] add new -e option

and add some TODOs
[2307] some xml formatting

content is not changed in this commit
[2307]fix misspelling typos in output
[2307] mention some defaults, reword some option descriptions

and clarify some options better
[2307] See also the DHCP Performance Guide
[2307] Added the full list of options to the perfdhcp man page

Also added section on templates, separate the options out into
different categories, and generally tidied up the XML.
[2307] Minor changes as the result of review.
[3339] data::merge now handles map elements

data::merge function is intended to merge to map elements together.
However, if those maps contain elements which are themselves maps they
are not merged.  The function uses recursion to merge map sub-elements.
[2307] Minor change as a result of second review.
[2307] Feformatted so that most lines are no longer than 80 characters wide
[master] Merge branch 'trac3339'

data::merge function now merges map sub elements.
[master] Added ChangeLog entry 760 for Trac #3339
[master] Simplify the header check that was added
[master] Fix indent in ChangeLog
[master] Merge branch 'trac2307'

Conflicts:
	tests/tools/perfdhcp/Makefile.am
[master] ChangeLog for #2307