Conflicts:
	src/lib/datasrc/tests/memory_datasrc_unittest.cc

test case.

essentially nothing changed, but it would clarify it's part of the test.

the check that we have already sent something if the timeout happens to fire was missing, discussed with Jeremy on jabber

- change the for loop to a while, with only a single immutable parameter
- constify some parameters when possible

(This got lost in the merge.)

- only set a prompt if we have an interactive terminal
- be a bit less verbose on errors

in case of a socket error, only print that error, and not the extra (is it running?) message.
FailToLogin() exception is no longer printed (the methods that raise it already print the real error themselves)
Unexpected Exceptions are now printed *more* verbose, i.e. with a full stacktrace instead of just a message. If we want to 'expect' more error types (and only print a short message that speaks for itself, to look more userfriendly), we should add those explicitely, and not use 'except Exception'.

Conflicts:
	configure.ac
	src/lib/log/Makefile.am

This reverts commit 086b420b.

Conflicts:

	src/bin/bindctl/bindcmd.py

It had stopped working for any identifier that did not start with /, this should fix that

the original "from wire" code was actually buggy, too, and it's now fixed.

public method to the NSEC3 class, getNext() primarily for the test
(but it would be useful more practical purposes, too).

[master] minor fix. Remove some space at the end of lines, and fix one doxygen comment. skip review.

- include test headers and test data files in Makefile for distcheck
- add constructor for DerivedRRsetEntry (without that it fails on solaris/gcc)
- temporarily disabled message_cache test testUpdate (fails on several system, looking into the actual problem right now, will enable again once found)