Conflicts:
bin/tests/system/conf.sh.in
lib/dns/win32/libdns.def.in
lib/isc/win32/file.c
The merge also needed to update files in legacy and tcp system tests
(newly introduced in master after branch was created) to introduce use
of lockfile.
of individual resource records. This tool is intended
to be called by provisioning systems so that the front
end does not need to be upgraded to support new DNS
record types. [RT #34778]
