(cherry picked from commit db93c0def5) (cherry picked from commit 9b56539c01) Conflicts: lib/isc/app_api.c lib/isc/win32/libisc.def.in
db93c0def5
9b56539c01