Master contains fix of #338, which influences this code quite a lot.
The merge includes not only the code-level conflict resolutions, but
also logic-level conflicts and enabling of the tests that failed because
of #338.

Conflicts:
	src/bin/auth/tests/Makefile.am
	src/bin/resolver/Makefile.am
	src/bin/resolver/resolver.cc
	src/bin/resolver/tests/Makefile.am
	src/bin/resolver/tests/resolver_config_unittest.cc
	src/lib/Makefile.am