[master] Merge branch 'trac2585'

diff --cc src/bin/auth/tests/query_unittest.cc
Simple merge

diff --cc src/lib/datasrc/memory/zone_finder.cc
Simple merge