(cherry picked from commitdb93c0def5) (cherry picked from commit9b56539c01) Conflicts: lib/isc/app_api.c lib/isc/win32/libisc.def.in
(cherry picked from commitdb93c0def5) (cherry picked from commit9b56539c01) Conflicts: lib/isc/app_api.c lib/isc/win32/libisc.def.in