Conflicts:
	src/bin/bindctl/tests/bindctl_test.py

Was not NetBSD-specific, but the symptom only appeared to show there; you cannot reliably do 2 tcp async_send's without waiting for the completion in between.

Fixed it by writing output to a temporary buffer that includes the TCP length data (we might want to consider allowing MessageRenderer to append to a buffer, btw)

They need to be put to the test file, if they are not default values of
parameters.

It seems g++ doesn't like to pass objects defined inside a function as a
template parameter somewhere. Taken out of the function.

* A variable name
* Clarification of man pages

Handled conflict.
Also removed spaces on a blank line.

Also manually fixed some conflicts.

Also sort these.

[master] Fix the minor problem brought on by merging trac493: the blank space in changelog and EOL, add the unmerged test case of message cache.

Conflicts:
	src/lib/cache/tests/Makefile.am
	src/lib/cache/tests/message_cache_unittest.cc
	src/lib/cache/tests/message_entry_unittest.cc