From: Evan Hunt <each@isc.org>
Date: Thu, 22 Feb 2018 23:10:37 +0000 (-0800)
Subject: final cleanup
X-Git-Tag: v9.13.0~150^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c559199bf899c9f1aa636e535668f3b494e1c96;p=thirdparty%2Fbind9.git

final cleanup

- add CHANGES note
- update copyrights and license headers
- add -j to the make commands in .gitlab-ci.yml to take
  advantage of parallelization in the gitlab CI process
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 737df9809fc..8bfe3dcec30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,7 +86,7 @@ stages:
     - ./autogen.sh
   script:
     - ./configure --with-libtool
-    - make -k all V=1
+    - make -j6 -k all V=1
   artifacts:
     expire_in: '1 hour'
     untracked: true
@@ -96,7 +96,7 @@ stages:
   before_script:
     - bash -x bin/tests/system/ifconfig.sh up
   script:
-    - make -k check V=1
+    - make -j5 -k check V=1
   artifacts:
     untracked: true
     expire_in: '1 week'
diff --git a/CHANGES b/CHANGES
index 40208988017..35cd89bb116 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+4899.	[test]		Convert most of the remaining system tests to be able
+			to run in parallel, continuing the work from change
+			#4895. To take advantage of this, use "make -jN check",
+			where N is the number of processors to use. [GL #91]
+
 4898.	[func]		Remove libseccomp based system-call filtering. [GL #93]
 
 4897.	[test]		Update to rpz system test so that it doesn't recurse.
diff --git a/README.md b/README.md
index ca64ed413a9..9fd2b0af7a6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
- - Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  -
  - This Source Code Form is subject to the terms of the Mozilla Public
  - License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 9b5ffd5f4be..f24568640bd 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2008, 2010-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/README b/bin/tests/system/README
index 29ad047ea83..ddd39509cb8 100644
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -1,10 +1,9 @@
-Copyright (C) 2000, 2001, 2004, 2010, 2011, 2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2000, 2001, 2004, 2010, 2011, 2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 Introduction
 ===
 This directory holds a simple test environment for running bind9 system tests
diff --git a/bin/tests/system/acl/clean.sh b/bin/tests/system/acl/clean.sh
index 6164174ea82..bfe1b8151bc 100644
--- a/bin/tests/system/acl/clean.sh
+++ b/bin/tests/system/acl/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns2/named1.conf.in b/bin/tests/system/acl/ns2/named1.conf.in
index dd67c397148..6d8e201c551 100644
--- a/bin/tests/system/acl/ns2/named1.conf.in
+++ b/bin/tests/system/acl/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns2/named2.conf.in b/bin/tests/system/acl/ns2/named2.conf.in
index 982b056a614..51a10047f35 100644
--- a/bin/tests/system/acl/ns2/named2.conf.in
+++ b/bin/tests/system/acl/ns2/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns2/named3.conf.in b/bin/tests/system/acl/ns2/named3.conf.in
index 4eb85164918..ee63a59c28c 100644
--- a/bin/tests/system/acl/ns2/named3.conf.in
+++ b/bin/tests/system/acl/ns2/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns2/named4.conf.in b/bin/tests/system/acl/ns2/named4.conf.in
index a7f20de6f9a..42f585fc21a 100644
--- a/bin/tests/system/acl/ns2/named4.conf.in
+++ b/bin/tests/system/acl/ns2/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2008, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns2/named5.conf.in b/bin/tests/system/acl/ns2/named5.conf.in
index b8e82505f24..3a3a3ace9f7 100644
--- a/bin/tests/system/acl/ns2/named5.conf.in
+++ b/bin/tests/system/acl/ns2/named5.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns2/named6.conf.in b/bin/tests/system/acl/ns2/named6.conf.in
index f78b4be7ee6..a61e1df001a 100644
--- a/bin/tests/system/acl/ns2/named6.conf.in
+++ b/bin/tests/system/acl/ns2/named6.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns2/named7.conf.in b/bin/tests/system/acl/ns2/named7.conf.in
index 5f6e1276ad2..4b9209651c6 100644
--- a/bin/tests/system/acl/ns2/named7.conf.in
+++ b/bin/tests/system/acl/ns2/named7.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns3/named.conf.in b/bin/tests/system/acl/ns3/named.conf.in
index 8260f3c5fe7..6b570d244d2 100644
--- a/bin/tests/system/acl/ns3/named.conf.in
+++ b/bin/tests/system/acl/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/ns4/named.conf.in b/bin/tests/system/acl/ns4/named.conf.in
index 24537015708..35644519a82 100644
--- a/bin/tests/system/acl/ns4/named.conf.in
+++ b/bin/tests/system/acl/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh
index 4bb9a1f3853..a2fefffa4f0 100644
--- a/bin/tests/system/acl/setup.sh
+++ b/bin/tests/system/acl/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh
index 0954fdd55e9..de462f2a80e 100644
--- a/bin/tests/system/acl/tests.sh
+++ b/bin/tests/system/acl/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008, 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008, 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/clean.sh b/bin/tests/system/additional/clean.sh
index 1d08ac14fe7..1803deb5f3a 100644
--- a/bin/tests/system/additional/clean.sh
+++ b/bin/tests/system/additional/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/ns1/named1.conf.in b/bin/tests/system/additional/ns1/named1.conf.in
index 6ee1f636092..7265f643e94 100644
--- a/bin/tests/system/additional/ns1/named1.conf.in
+++ b/bin/tests/system/additional/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/ns1/named2.conf.in b/bin/tests/system/additional/ns1/named2.conf.in
index 64377702ea5..18fc79c2060 100644
--- a/bin/tests/system/additional/ns1/named2.conf.in
+++ b/bin/tests/system/additional/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/ns1/named3.conf.in b/bin/tests/system/additional/ns1/named3.conf.in
index c6142ef993d..3c60213d69b 100644
--- a/bin/tests/system/additional/ns1/named3.conf.in
+++ b/bin/tests/system/additional/ns1/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/ns1/named4.conf.in b/bin/tests/system/additional/ns1/named4.conf.in
index 115447c652f..935ede55c6e 100644
--- a/bin/tests/system/additional/ns1/named4.conf.in
+++ b/bin/tests/system/additional/ns1/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/ns3/named.conf.in b/bin/tests/system/additional/ns3/named.conf.in
index 10198658537..ba620a96fc5 100644
--- a/bin/tests/system/additional/ns3/named.conf.in
+++ b/bin/tests/system/additional/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/setup.sh b/bin/tests/system/additional/setup.sh
index 5de1d35bfd4..bf8f201087f 100644
--- a/bin/tests/system/additional/setup.sh
+++ b/bin/tests/system/additional/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh
index 20a7688cd95..887250a19e3 100644
--- a/bin/tests/system/additional/tests.sh
+++ b/bin/tests/system/additional/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index f3b4d31373c..6666af6acd7 100644
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/ns1/named.conf.in b/bin/tests/system/addzone/ns1/named.conf.in
index e30fbcbb67f..6af9862720b 100644
--- a/bin/tests/system/addzone/ns1/named.conf.in
+++ b/bin/tests/system/addzone/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/ns2/named1.conf.in b/bin/tests/system/addzone/ns2/named1.conf.in
index 6e969dd7149..c22270c07d0 100644
--- a/bin/tests/system/addzone/ns2/named1.conf.in
+++ b/bin/tests/system/addzone/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/ns2/named2.conf.in b/bin/tests/system/addzone/ns2/named2.conf.in
index d156b552c36..797e5d98d0e 100644
--- a/bin/tests/system/addzone/ns2/named2.conf.in
+++ b/bin/tests/system/addzone/ns2/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/ns2/named3.conf.in b/bin/tests/system/addzone/ns2/named3.conf.in
index df32280ecba..75a3a5a71bd 100644
--- a/bin/tests/system/addzone/ns2/named3.conf.in
+++ b/bin/tests/system/addzone/ns2/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/ns3/named1.conf.in b/bin/tests/system/addzone/ns3/named1.conf.in
index 9c08ad07da2..b78d305c61e 100644
--- a/bin/tests/system/addzone/ns3/named1.conf.in
+++ b/bin/tests/system/addzone/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/ns3/named2.conf.in b/bin/tests/system/addzone/ns3/named2.conf.in
index 9b5ff25115b..acf7f0ae47d 100644
--- a/bin/tests/system/addzone/ns3/named2.conf.in
+++ b/bin/tests/system/addzone/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index 1c7ae52e262..98632c2e652 100644
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh
index 8b61adbd2b5..c1d63d13feb 100755
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/allow_query/clean.sh b/bin/tests/system/allow_query/clean.sh
index 6b42373d1e7..1675d52581d 100644
--- a/bin/tests/system/allow_query/clean.sh
+++ b/bin/tests/system/allow_query/clean.sh
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: clean.sh,v 1.2 2010/11/16 01:37:36 sar Exp $
-
 #
 # Clean up after allow query tests.
 #
diff --git a/bin/tests/system/allow_query/ns2/named01.conf.in b/bin/tests/system/allow_query/ns2/named01.conf.in
index 7c26a7296c4..05412714697 100644
--- a/bin/tests/system/allow_query/ns2/named01.conf.in
+++ b/bin/tests/system/allow_query/ns2/named01.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named01.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named02.conf.in b/bin/tests/system/allow_query/ns2/named02.conf.in
index 80c14392070..a78e76d8ddd 100644
--- a/bin/tests/system/allow_query/ns2/named02.conf.in
+++ b/bin/tests/system/allow_query/ns2/named02.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named02.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named03.conf.in b/bin/tests/system/allow_query/ns2/named03.conf.in
index bc1f4ca27fd..08ee3a297ec 100644
--- a/bin/tests/system/allow_query/ns2/named03.conf.in
+++ b/bin/tests/system/allow_query/ns2/named03.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named03.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named04.conf.in b/bin/tests/system/allow_query/ns2/named04.conf.in
index 66d04780a1f..01dee4181f8 100644
--- a/bin/tests/system/allow_query/ns2/named04.conf.in
+++ b/bin/tests/system/allow_query/ns2/named04.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named04.conf,v 1.2 2010/11/16 01:37:37 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named05.conf.in b/bin/tests/system/allow_query/ns2/named05.conf.in
index 4f26e6665e6..7d6cafae3c1 100644
--- a/bin/tests/system/allow_query/ns2/named05.conf.in
+++ b/bin/tests/system/allow_query/ns2/named05.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named05.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named06.conf.in b/bin/tests/system/allow_query/ns2/named06.conf.in
index 39f9979139c..ecf8fe8ab39 100644
--- a/bin/tests/system/allow_query/ns2/named06.conf.in
+++ b/bin/tests/system/allow_query/ns2/named06.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named06.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named07.conf.in b/bin/tests/system/allow_query/ns2/named07.conf.in
index 72be48c989c..0632e1d0f6f 100644
--- a/bin/tests/system/allow_query/ns2/named07.conf.in
+++ b/bin/tests/system/allow_query/ns2/named07.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named07.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named08.conf.in b/bin/tests/system/allow_query/ns2/named08.conf.in
index cc003d5bb69..0ab477cdf95 100644
--- a/bin/tests/system/allow_query/ns2/named08.conf.in
+++ b/bin/tests/system/allow_query/ns2/named08.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named08.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.1; };
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named09.conf.in b/bin/tests/system/allow_query/ns2/named09.conf.in
index 33f4b2f0a46..3abcf13be81 100644
--- a/bin/tests/system/allow_query/ns2/named09.conf.in
+++ b/bin/tests/system/allow_query/ns2/named09.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named09.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named10.conf.in b/bin/tests/system/allow_query/ns2/named10.conf.in
index 43704b09249..eb4c22d775a 100644
--- a/bin/tests/system/allow_query/ns2/named10.conf.in
+++ b/bin/tests/system/allow_query/ns2/named10.conf.in
@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named10.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";
diff --git a/bin/tests/system/allow_query/ns2/named11.conf.in b/bin/tests/system/allow_query/ns2/named11.conf.in
index c0504ed1288..4aaa567b950 100644
--- a/bin/tests/system/allow_query/ns2/named11.conf.in
+++ b/bin/tests/system/allow_query/ns2/named11.conf.in
@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named11.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";
diff --git a/bin/tests/system/allow_query/ns2/named12.conf.in b/bin/tests/system/allow_query/ns2/named12.conf.in
index f376ee7eb66..163870ddca1 100644
--- a/bin/tests/system/allow_query/ns2/named12.conf.in
+++ b/bin/tests/system/allow_query/ns2/named12.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named12.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";
diff --git a/bin/tests/system/allow_query/ns2/named21.conf.in b/bin/tests/system/allow_query/ns2/named21.conf.in
index c28a52a795c..d688b6b5c42 100644
--- a/bin/tests/system/allow_query/ns2/named21.conf.in
+++ b/bin/tests/system/allow_query/ns2/named21.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named21.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named22.conf.in b/bin/tests/system/allow_query/ns2/named22.conf.in
index f668f0294e0..526734cb753 100644
--- a/bin/tests/system/allow_query/ns2/named22.conf.in
+++ b/bin/tests/system/allow_query/ns2/named22.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named22.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named23.conf.in b/bin/tests/system/allow_query/ns2/named23.conf.in
index a5045382172..23cf7736adb 100644
--- a/bin/tests/system/allow_query/ns2/named23.conf.in
+++ b/bin/tests/system/allow_query/ns2/named23.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named23.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named24.conf.in b/bin/tests/system/allow_query/ns2/named24.conf.in
index eac68fbc544..05c179210be 100644
--- a/bin/tests/system/allow_query/ns2/named24.conf.in
+++ b/bin/tests/system/allow_query/ns2/named24.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named24.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named25.conf.in b/bin/tests/system/allow_query/ns2/named25.conf.in
index 829350ad31a..ed009e2313f 100644
--- a/bin/tests/system/allow_query/ns2/named25.conf.in
+++ b/bin/tests/system/allow_query/ns2/named25.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named25.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named26.conf.in b/bin/tests/system/allow_query/ns2/named26.conf.in
index 6ba62295280..76d1cff3ca2 100644
--- a/bin/tests/system/allow_query/ns2/named26.conf.in
+++ b/bin/tests/system/allow_query/ns2/named26.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named26.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named27.conf.in b/bin/tests/system/allow_query/ns2/named27.conf.in
index 8092a59dea7..fc5d216f1aa 100644
--- a/bin/tests/system/allow_query/ns2/named27.conf.in
+++ b/bin/tests/system/allow_query/ns2/named27.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named27.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named28.conf.in b/bin/tests/system/allow_query/ns2/named28.conf.in
index a3327367ddc..037b02101a7 100644
--- a/bin/tests/system/allow_query/ns2/named28.conf.in
+++ b/bin/tests/system/allow_query/ns2/named28.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named28.conf,v 1.2 2010/11/16 01:37:38 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.1; };
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named29.conf.in b/bin/tests/system/allow_query/ns2/named29.conf.in
index dddf4043a03..657fe86aa73 100644
--- a/bin/tests/system/allow_query/ns2/named29.conf.in
+++ b/bin/tests/system/allow_query/ns2/named29.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named29.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 options {
diff --git a/bin/tests/system/allow_query/ns2/named30.conf.in b/bin/tests/system/allow_query/ns2/named30.conf.in
index cf1cad459dc..90dc8033d90 100644
--- a/bin/tests/system/allow_query/ns2/named30.conf.in
+++ b/bin/tests/system/allow_query/ns2/named30.conf.in
@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named30.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";
diff --git a/bin/tests/system/allow_query/ns2/named31.conf.in b/bin/tests/system/allow_query/ns2/named31.conf.in
index bf2da6f662d..a4cdadcedf2 100644
--- a/bin/tests/system/allow_query/ns2/named31.conf.in
+++ b/bin/tests/system/allow_query/ns2/named31.conf.in
@@ -1,16 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named31.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";
diff --git a/bin/tests/system/allow_query/ns2/named32.conf.in b/bin/tests/system/allow_query/ns2/named32.conf.in
index c6b3b2e5456..1f3dc2f2735 100644
--- a/bin/tests/system/allow_query/ns2/named32.conf.in
+++ b/bin/tests/system/allow_query/ns2/named32.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named32.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 key one {
 	algorithm hmac-md5;
 	secret "1234abcd8765";
diff --git a/bin/tests/system/allow_query/ns2/named33.conf.in b/bin/tests/system/allow_query/ns2/named33.conf.in
index 3316d27dcee..078dfb29996 100644
--- a/bin/tests/system/allow_query/ns2/named33.conf.in
+++ b/bin/tests/system/allow_query/ns2/named33.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named33.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named34.conf.in b/bin/tests/system/allow_query/ns2/named34.conf.in
index 2b0ce081142..058bddfafc9 100644
--- a/bin/tests/system/allow_query/ns2/named34.conf.in
+++ b/bin/tests/system/allow_query/ns2/named34.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named34.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named40.conf.in b/bin/tests/system/allow_query/ns2/named40.conf.in
index 8388f109bba..5dc53d14615 100644
--- a/bin/tests/system/allow_query/ns2/named40.conf.in
+++ b/bin/tests/system/allow_query/ns2/named40.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named40.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 acl accept { 10.53.0.2; };
 
 acl badaccept { 10.53.0.1; };
diff --git a/bin/tests/system/allow_query/ns2/named53.conf.in b/bin/tests/system/allow_query/ns2/named53.conf.in
index 0fed5846ce3..476bb09f5f6 100644
--- a/bin/tests/system/allow_query/ns2/named53.conf.in
+++ b/bin/tests/system/allow_query/ns2/named53.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named53.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named54.conf.in b/bin/tests/system/allow_query/ns2/named54.conf.in
index f8a922d3876..f57ed0b7cce 100644
--- a/bin/tests/system/allow_query/ns2/named54.conf.in
+++ b/bin/tests/system/allow_query/ns2/named54.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named54.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named55.conf.in b/bin/tests/system/allow_query/ns2/named55.conf.in
index e577ec6a3d2..039ed2d46e6 100644
--- a/bin/tests/system/allow_query/ns2/named55.conf.in
+++ b/bin/tests/system/allow_query/ns2/named55.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named55.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named56.conf.in b/bin/tests/system/allow_query/ns2/named56.conf.in
index 05daff6a527..5768b299a93 100644
--- a/bin/tests/system/allow_query/ns2/named56.conf.in
+++ b/bin/tests/system/allow_query/ns2/named56.conf.in
@@ -1,15 +1,11 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named56.conf,v 1.2 2010/11/16 01:37:39 sar Exp $ */
-
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/ns2/named57.conf.in b/bin/tests/system/allow_query/ns2/named57.conf.in
index 7bd9f7a5bb9..45353331cc7 100644
--- a/bin/tests/system/allow_query/ns2/named57.conf.in
+++ b/bin/tests/system/allow_query/ns2/named57.conf.in
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-controls { /* empty */ };
-
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/allow_query/setup.sh b/bin/tests/system/allow_query/setup.sh
index accd4a80c64..77e5eea4a90 100644
--- a/bin/tests/system/allow_query/setup.sh
+++ b/bin/tests/system/allow_query/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/allow_query/tests.sh b/bin/tests/system/allow_query/tests.sh
index 90272777126..5f3509ce714 100644
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow_query/tests.sh
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: tests.sh,v 1.3 2010/12/02 23:22:41 marka Exp $
-
 # Test of allow-query statement.
 # allow-query takes an address match list and can be included in either the
 # options statement or in the zone statement.  This test assumes that the
diff --git a/bin/tests/system/ans.pl b/bin/tests/system/ans.pl
index c240d63b992..cf308ec0506 100644
--- a/bin/tests/system/ans.pl
+++ b/bin/tests/system/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/auth/setup.sh b/bin/tests/system/auth/setup.sh
index d4f9dbc3588..c72b22a8139 100644
--- a/bin/tests/system/auth/setup.sh
+++ b/bin/tests/system/auth/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
index f84fc248816..18be2769f9b 100644
--- a/bin/tests/system/autosign/clean.sh
+++ b/bin/tests/system/autosign/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/ns1/named.conf.in b/bin/tests/system/autosign/ns1/named.conf.in
index f345c7a4556..97bd12c1810 100644
--- a/bin/tests/system/autosign/ns1/named.conf.in
+++ b/bin/tests/system/autosign/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/ns2/named.conf.in b/bin/tests/system/autosign/ns2/named.conf.in
index d13c9c62751..37a4f7fa02f 100644
--- a/bin/tests/system/autosign/ns2/named.conf.in
+++ b/bin/tests/system/autosign/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/ns3/named.conf.in b/bin/tests/system/autosign/ns3/named.conf.in
index 06f404cc49f..eed75ff7b4c 100644
--- a/bin/tests/system/autosign/ns3/named.conf.in
+++ b/bin/tests/system/autosign/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/ns4/named.conf.in b/bin/tests/system/autosign/ns4/named.conf.in
index 4353fd82984..30f32cda506 100644
--- a/bin/tests/system/autosign/ns4/named.conf.in
+++ b/bin/tests/system/autosign/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/ns5/named.conf.in b/bin/tests/system/autosign/ns5/named.conf.in
index 3776961ce14..f024416e5df 100644
--- a/bin/tests/system/autosign/ns5/named.conf.in
+++ b/bin/tests/system/autosign/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 0a78c6ee1f3..1b1cfe311b4 100644
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2010, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh
index 1bc0c6f8c57..6cf7153d059 100755
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/builtin/clean.sh b/bin/tests/system/builtin/clean.sh
index 89f20492fc2..ca32ae3bdbd 100644
--- a/bin/tests/system/builtin/clean.sh
+++ b/bin/tests/system/builtin/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/builtin/ns1/named.conf.in b/bin/tests/system/builtin/ns1/named.conf.in
index 42820f0b33e..14c64b1adbc 100644
--- a/bin/tests/system/builtin/ns1/named.conf.in
+++ b/bin/tests/system/builtin/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/builtin/ns2/named.conf.in b/bin/tests/system/builtin/ns2/named.conf.in
index a755fe32d85..0303b0c6b83 100644
--- a/bin/tests/system/builtin/ns2/named.conf.in
+++ b/bin/tests/system/builtin/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/builtin/ns3/named.conf.in b/bin/tests/system/builtin/ns3/named.conf.in
index cb744bbfa7d..3b4ea6def3a 100644
--- a/bin/tests/system/builtin/ns3/named.conf.in
+++ b/bin/tests/system/builtin/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh
index 98901df6c35..4b16bbdc363 100644
--- a/bin/tests/system/builtin/tests.sh
+++ b/bin/tests/system/builtin/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index 34f287e088c..7a9efb09849 100644
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cacheclean/ns1/named.conf.in b/bin/tests/system/cacheclean/ns1/named.conf.in
index 4f35511bcad..085030f753a 100644
--- a/bin/tests/system/cacheclean/ns1/named.conf.in
+++ b/bin/tests/system/cacheclean/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index e36fdffbf01..657ea166322 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001, 2004, 2005, 2007, 2011, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: named.conf,v 1.10 2011/08/02 23:47:52 tbox Exp $ */
-
 options {
 	query-source address 10.53.0.2;
 	notify-source 10.53.0.2;
diff --git a/bin/tests/system/cacheclean/setup.sh b/bin/tests/system/cacheclean/setup.sh
index d4f9dbc3588..c72b22a8139 100644
--- a/bin/tests/system/cacheclean/setup.sh
+++ b/bin/tests/system/cacheclean/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index 3566b9c65be..da88070bcd2 100755
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/case/clean.sh b/bin/tests/system/case/clean.sh
index e98c7f9a228..af4ea3476df 100644
--- a/bin/tests/system/case/clean.sh
+++ b/bin/tests/system/case/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/case/ns1/named.conf.in b/bin/tests/system/case/ns1/named.conf.in
index 9e988ac8006..65f69787ce8 100644
--- a/bin/tests/system/case/ns1/named.conf.in
+++ b/bin/tests/system/case/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/case/ns2/named.conf.in b/bin/tests/system/case/ns2/named.conf.in
index 5738ca07f59..31355d2a1c2 100644
--- a/bin/tests/system/case/ns2/named.conf.in
+++ b/bin/tests/system/case/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh
index bad7b34cfd7..9900ae20116 100644
--- a/bin/tests/system/case/setup.sh
+++ b/bin/tests/system/case/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/case/tests.sh b/bin/tests/system/case/tests.sh
index 32c121a83d4..c2a3a9e7287 100644
--- a/bin/tests/system/case/tests.sh
+++ b/bin/tests/system/case/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/catz/clean.sh b/bin/tests/system/catz/clean.sh
index da2bbf000f4..cdc5c9c8383 100644
--- a/bin/tests/system/catz/clean.sh
+++ b/bin/tests/system/catz/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/catz/ns1/named.conf.in b/bin/tests/system/catz/ns1/named.conf.in
index 30d357a4c12..d798f54506d 100644
--- a/bin/tests/system/catz/ns1/named.conf.in
+++ b/bin/tests/system/catz/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/catz/ns2/named.conf.in b/bin/tests/system/catz/ns2/named.conf.in
index 91e44deb1f1..9451b6caeaa 100644
--- a/bin/tests/system/catz/ns2/named.conf.in
+++ b/bin/tests/system/catz/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/catz/ns3/named.conf.in b/bin/tests/system/catz/ns3/named.conf.in
index 4ea539917ec..08507e864f1 100644
--- a/bin/tests/system/catz/ns3/named.conf.in
+++ b/bin/tests/system/catz/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh
index faa9fbec5c0..8a7252edb10 100644
--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cds/tests.sh b/bin/tests/system/cds/tests.sh
index a4098ce8959..b89d6db5553 100644
--- a/bin/tests/system/cds/tests.sh
+++ b/bin/tests/system/cds/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/ans3/ans.pl b/bin/tests/system/chain/ans3/ans.pl
index 7eb3a84d570..07fb9de876f 100644
--- a/bin/tests/system/chain/ans3/ans.pl
+++ b/bin/tests/system/chain/ans3/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/ans4/README.anspy b/bin/tests/system/chain/ans4/README.anspy
index 67bd237dc69..b83eac19d68 100644
--- a/bin/tests/system/chain/ans4/README.anspy
+++ b/bin/tests/system/chain/ans4/README.anspy
@@ -1,4 +1,4 @@
-Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/ans4/ans.py b/bin/tests/system/chain/ans4/ans.py
index 42ff4adb215..0423e917b9e 100755
--- a/bin/tests/system/chain/ans4/ans.py
+++ b/bin/tests/system/chain/ans4/ans.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/clean.sh b/bin/tests/system/chain/clean.sh
index 8b6ba8f1157..7b52f83fb73 100755
--- a/bin/tests/system/chain/clean.sh
+++ b/bin/tests/system/chain/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/ns1/named.conf.in b/bin/tests/system/chain/ns1/named.conf.in
index 7942c90c092..ab83a309448 100644
--- a/bin/tests/system/chain/ns1/named.conf.in
+++ b/bin/tests/system/chain/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/ns2/named.conf.in b/bin/tests/system/chain/ns2/named.conf.in
index c284a7de3c5..f153d541639 100644
--- a/bin/tests/system/chain/ns2/named.conf.in
+++ b/bin/tests/system/chain/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/ns5/named.conf.in b/bin/tests/system/chain/ns5/named.conf.in
index f20e4eeeafc..fd9bcf53f28 100644
--- a/bin/tests/system/chain/ns5/named.conf.in
+++ b/bin/tests/system/chain/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/ns7/named.conf.in b/bin/tests/system/chain/ns7/named.conf.in
index 39824491548..dcf7b28ddba 100644
--- a/bin/tests/system/chain/ns7/named.conf.in
+++ b/bin/tests/system/chain/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/prereq.sh b/bin/tests/system/chain/prereq.sh
index eba0165cd75..499fec887d0 100644
--- a/bin/tests/system/chain/prereq.sh
+++ b/bin/tests/system/chain/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/setup.sh b/bin/tests/system/chain/setup.sh
index f33324da453..0f117ca6867 100644
--- a/bin/tests/system/chain/setup.sh
+++ b/bin/tests/system/chain/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh
index 5307171dee9..59125e21f7c 100644
--- a/bin/tests/system/chain/tests.sh
+++ b/bin/tests/system/chain/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2012, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checkds/tests.sh b/bin/tests/system/checkds/tests.sh
index eb5d4c9f19f..ba82ef34460 100644
--- a/bin/tests/system/checkds/tests.sh
+++ b/bin/tests/system/checkds/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh
index 5927eae8e86..2e7e80cb773 100644
--- a/bin/tests/system/checknames/clean.sh
+++ b/bin/tests/system/checknames/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checknames/ns1/named.conf.in b/bin/tests/system/checknames/ns1/named.conf.in
index a244c0f1040..182e559ead4 100644
--- a/bin/tests/system/checknames/ns1/named.conf.in
+++ b/bin/tests/system/checknames/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checknames/ns2/named.conf.in b/bin/tests/system/checknames/ns2/named.conf.in
index cc0f4f7fdf3..df38af2d981 100644
--- a/bin/tests/system/checknames/ns2/named.conf.in
+++ b/bin/tests/system/checknames/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checknames/ns3/named.conf.in b/bin/tests/system/checknames/ns3/named.conf.in
index 6f3cf14baa3..052a9dcf475 100644
--- a/bin/tests/system/checknames/ns3/named.conf.in
+++ b/bin/tests/system/checknames/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checknames/ns4/named.conf.in b/bin/tests/system/checknames/ns4/named.conf.in
index 3394d087352..4272c8f348b 100644
--- a/bin/tests/system/checknames/ns4/named.conf.in
+++ b/bin/tests/system/checknames/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh
index 8d65cd2bf3d..3ce5c852a41 100644
--- a/bin/tests/system/checknames/setup.sh
+++ b/bin/tests/system/checknames/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh
index e304d0a6172..22fa2e3f517 100644
--- a/bin/tests/system/checknames/tests.sh
+++ b/bin/tests/system/checknames/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index 03c88358da8..4b0c1a04b85 100644
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/clean.sh b/bin/tests/system/clean.sh
index a53724917c2..89a7a06f494 100644
--- a/bin/tests/system/clean.sh
+++ b/bin/tests/system/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 6920734c1ed..06b7a5b6ea0 100644
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/common/controls.conf.in b/bin/tests/system/common/controls.conf.in
index f27441b2f10..2bcd95f4922 100644
--- a/bin/tests/system/common/controls.conf.in
+++ b/bin/tests/system/common/controls.conf.in
@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/* $Id: controls.conf,v 1.6 2007/06/19 23:47:01 tbox Exp $ */
-
 key rndc_key {
 	secret "1234abcd8765";
 	algorithm hmac-sha256;
diff --git a/bin/tests/system/cookie/clean.sh b/bin/tests/system/cookie/clean.sh
index 02019605dae..f83d7366dc3 100644
--- a/bin/tests/system/cookie/clean.sh
+++ b/bin/tests/system/cookie/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.in
index 9919349817f..dbfb3b67396 100644
--- a/bin/tests/system/cookie/ns1/named.conf.in
+++ b/bin/tests/system/cookie/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/ns2/named.conf.in b/bin/tests/system/cookie/ns2/named.conf.in
index bb7c830c285..7f4e070abd8 100644
--- a/bin/tests/system/cookie/ns2/named.conf.in
+++ b/bin/tests/system/cookie/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.in
index 196565dee41..d6ba8cdfb9f 100644
--- a/bin/tests/system/cookie/ns3/named.conf.in
+++ b/bin/tests/system/cookie/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/ns4/named.conf.in b/bin/tests/system/cookie/ns4/named.conf.in
index 3d1d1e73056..f2dfaa23c43 100644
--- a/bin/tests/system/cookie/ns4/named.conf.in
+++ b/bin/tests/system/cookie/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/ns5/named.conf.in b/bin/tests/system/cookie/ns5/named.conf.in
index 93de7fe56b5..a8eec7854e4 100644
--- a/bin/tests/system/cookie/ns5/named.conf.in
+++ b/bin/tests/system/cookie/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/ns6/named.conf.in b/bin/tests/system/cookie/ns6/named.conf.in
index d1f220039fb..5fa38782d5a 100644
--- a/bin/tests/system/cookie/ns6/named.conf.in
+++ b/bin/tests/system/cookie/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/setup.sh b/bin/tests/system/cookie/setup.sh
index c5c0abaf603..d1c5f548709 100644
--- a/bin/tests/system/cookie/setup.sh
+++ b/bin/tests/system/cookie/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh
index a0af7e0e036..68ab36fc94e 100755
--- a/bin/tests/system/cookie/tests.sh
+++ b/bin/tests/system/cookie/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/coverage/prereq.sh b/bin/tests/system/coverage/prereq.sh
index 673708b806f..aa00083191e 100644
--- a/bin/tests/system/coverage/prereq.sh
+++ b/bin/tests/system/coverage/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/coverage/tests.sh b/bin/tests/system/coverage/tests.sh
index 6ef1ff1fc05..8f0acf2130e 100644
--- a/bin/tests/system/coverage/tests.sh
+++ b/bin/tests/system/coverage/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh
index c99245a9625..afc02a82391 100644
--- a/bin/tests/system/database/clean.sh
+++ b/bin/tests/system/database/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/database/ns1/named1.conf.in b/bin/tests/system/database/ns1/named1.conf.in
index 965eed4a0de..f16989ccdff 100644
--- a/bin/tests/system/database/ns1/named1.conf.in
+++ b/bin/tests/system/database/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/database/ns1/named2.conf.in b/bin/tests/system/database/ns1/named2.conf.in
index 347870c52e4..3851d40faeb 100644
--- a/bin/tests/system/database/ns1/named2.conf.in
+++ b/bin/tests/system/database/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh
index f6b933c053e..ee733a90b6c 100644
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 53586ad4338..8ac0588507f 100644
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh
index e18e36f0258..ee94539f025 100644
--- a/bin/tests/system/digdelv/clean.sh
+++ b/bin/tests/system/digdelv/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/digdelv/ns1/named.conf.in b/bin/tests/system/digdelv/ns1/named.conf.in
index be23c924913..ca5cd2ed9b6 100644
--- a/bin/tests/system/digdelv/ns1/named.conf.in
+++ b/bin/tests/system/digdelv/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/digdelv/ns2/named.conf.in b/bin/tests/system/digdelv/ns2/named.conf.in
index f21f4cbb862..e8c109c418f 100644
--- a/bin/tests/system/digdelv/ns2/named.conf.in
+++ b/bin/tests/system/digdelv/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/digdelv/ns3/named.conf.in b/bin/tests/system/digdelv/ns3/named.conf.in
index d39c45bd198..e4236309cd2 100644
--- a/bin/tests/system/digdelv/ns3/named.conf.in
+++ b/bin/tests/system/digdelv/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/digdelv/setup.sh b/bin/tests/system/digdelv/setup.sh
index e877403d82d..08a9c49e8ca 100644
--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index 3fe130585e4..7af589b896d 100644
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh
index 8f1413236a1..49a275de7fe 100644
--- a/bin/tests/system/dlv/clean.sh
+++ b/bin/tests/system/dlv/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010-2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns1/named.conf.in b/bin/tests/system/dlv/ns1/named.conf.in
index b4b22c7ddc1..6818caae03c 100644
--- a/bin/tests/system/dlv/ns1/named.conf.in
+++ b/bin/tests/system/dlv/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh
index 36af850d085..607a4ca9bc8 100755
--- a/bin/tests/system/dlv/ns1/sign.sh
+++ b/bin/tests/system/dlv/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns2/named.conf.in b/bin/tests/system/dlv/ns2/named.conf.in
index ece497ba0b0..ccc78361957 100644
--- a/bin/tests/system/dlv/ns2/named.conf.in
+++ b/bin/tests/system/dlv/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh
index 764465a04f5..0aa5adfe141 100755
--- a/bin/tests/system/dlv/ns2/sign.sh
+++ b/bin/tests/system/dlv/ns2/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns3/named.conf.in b/bin/tests/system/dlv/ns3/named.conf.in
index c400d7c50a9..70bed198797 100644
--- a/bin/tests/system/dlv/ns3/named.conf.in
+++ b/bin/tests/system/dlv/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index ba408e98f44..68b35428056 100755
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009-2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns4/named.conf.in b/bin/tests/system/dlv/ns4/named.conf.in
index cdeb7615933..972160143a5 100644
--- a/bin/tests/system/dlv/ns4/named.conf.in
+++ b/bin/tests/system/dlv/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns5/named.conf.in b/bin/tests/system/dlv/ns5/named.conf.in
index defe25a826a..3742eb79f6e 100644
--- a/bin/tests/system/dlv/ns5/named.conf.in
+++ b/bin/tests/system/dlv/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns6/named.conf.in b/bin/tests/system/dlv/ns6/named.conf.in
index d98699a0cde..e293cdf1ce7 100644
--- a/bin/tests/system/dlv/ns6/named.conf.in
+++ b/bin/tests/system/dlv/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/ns6/sign.sh b/bin/tests/system/dlv/ns6/sign.sh
index 165b59c17af..0b96aea59a4 100755
--- a/bin/tests/system/dlv/ns6/sign.sh
+++ b/bin/tests/system/dlv/ns6/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index 6608b8ab090..be8f1292dc4 100644
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2011, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2011, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlv/tests.sh b/bin/tests/system/dlv/tests.sh
index d5684fcf0af..f126e6b3ff5 100644
--- a/bin/tests/system/dlv/tests.sh
+++ b/bin/tests/system/dlv/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2010-2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2010-2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlz/clean.sh b/bin/tests/system/dlz/clean.sh
index 4f55ac2b518..10153cea266 100644
--- a/bin/tests/system/dlz/clean.sh
+++ b/bin/tests/system/dlz/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlz/ns1/named.conf.in b/bin/tests/system/dlz/ns1/named.conf.in
index 45a4a7c74cb..3d2b08b2e72 100644
--- a/bin/tests/system/dlz/ns1/named.conf.in
+++ b/bin/tests/system/dlz/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlz/prereq.sh.in b/bin/tests/system/dlz/prereq.sh.in
index 398d00c7430..879def8d5f8 100644
--- a/bin/tests/system/dlz/prereq.sh.in
+++ b/bin/tests/system/dlz/prereq.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlz/setup.sh b/bin/tests/system/dlz/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/dlz/setup.sh
+++ b/bin/tests/system/dlz/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlz/tests.sh b/bin/tests/system/dlz/tests.sh
index 0b155526eab..5a69b131bc9 100644
--- a/bin/tests/system/dlz/tests.sh
+++ b/bin/tests/system/dlz/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh
index cce160363ac..b28315c3018 100644
--- a/bin/tests/system/dlzexternal/clean.sh
+++ b/bin/tests/system/dlzexternal/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
index 128352b53c0..9465fabf56d 100644
--- a/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/dlzs.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlzexternal/ns1/named.conf.in b/bin/tests/system/dlzexternal/ns1/named.conf.in
index 5f650db0f29..b910f567261 100644
--- a/bin/tests/system/dlzexternal/ns1/named.conf.in
+++ b/bin/tests/system/dlzexternal/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlzexternal/prereq.sh b/bin/tests/system/dlzexternal/prereq.sh
index 8f0c601b263..72cbacf50f4 100644
--- a/bin/tests/system/dlzexternal/prereq.sh
+++ b/bin/tests/system/dlzexternal/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index 9af5067ecd8..8a60cc6f1cc 100644
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh
index b0d7415edf3..1effd9d4d79 100644
--- a/bin/tests/system/dlzexternal/tests.sh
+++ b/bin/tests/system/dlzexternal/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dns64/clean.sh b/bin/tests/system/dns64/clean.sh
index 4bb91c68973..dd3215ff224 100644
--- a/bin/tests/system/dns64/clean.sh
+++ b/bin/tests/system/dns64/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dns64/ns1/named.conf.in b/bin/tests/system/dns64/ns1/named.conf.in
index 5b024893ea8..7eaf18a6610 100644
--- a/bin/tests/system/dns64/ns1/named.conf.in
+++ b/bin/tests/system/dns64/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
index 91f3b3b4225..0192925419b 100644
--- a/bin/tests/system/dns64/ns2/named.conf.in
+++ b/bin/tests/system/dns64/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index f9076366399..89bd7e0f831 100644
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
index 5be5dd48e19..a832a4aad80 100644
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 05c5d9dff07..b7be4c8948e 100644
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002, 2004, 2007-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000-2002, 2004, 2007-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/dnssec_update_test.pl b/bin/tests/system/dnssec/dnssec_update_test.pl
index a9e988d94bf..dbb642d5ad5 100644
--- a/bin/tests/system/dnssec/dnssec_update_test.pl
+++ b/bin/tests/system/dnssec/dnssec_update_test.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2002, 2004, 2007, 2010, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2002, 2004, 2007, 2010, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns1/named.conf.in b/bin/tests/system/dnssec/ns1/named.conf.in
index 479b63a2599..89a5d04cb35 100644
--- a/bin/tests/system/dnssec/ns1/named.conf.in
+++ b/bin/tests/system/dnssec/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index d4d8812ddee..393c8a832d4 100644
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2006-2008, 2010, 2011, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2002, 2004, 2006-2008, 2010, 2011, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index 637f0005d56..42c8f569a90 100644
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2002, 2004, 2006-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000-2002, 2004, 2006-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns4/named1.conf.in b/bin/tests/system/dnssec/ns4/named1.conf.in
index 7635cd7e196..40e60511867 100644
--- a/bin/tests/system/dnssec/ns4/named1.conf.in
+++ b/bin/tests/system/dnssec/ns4/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns4/named2.conf.in b/bin/tests/system/dnssec/ns4/named2.conf.in
index 4a6bd41ea2a..2ad7f81596f 100644
--- a/bin/tests/system/dnssec/ns4/named2.conf.in
+++ b/bin/tests/system/dnssec/ns4/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns4/named3.conf.in b/bin/tests/system/dnssec/ns4/named3.conf.in
index 0df51edaaca..a4a6b4ddf46 100644
--- a/bin/tests/system/dnssec/ns4/named3.conf.in
+++ b/bin/tests/system/dnssec/ns4/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns4/named4.conf.in b/bin/tests/system/dnssec/ns4/named4.conf.in
index ee99f6b48d7..d57f5cfbb9b 100644
--- a/bin/tests/system/dnssec/ns4/named4.conf.in
+++ b/bin/tests/system/dnssec/ns4/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns5/named1.conf.in b/bin/tests/system/dnssec/ns5/named1.conf.in
index a22f6559f86..1850bb4c446 100644
--- a/bin/tests/system/dnssec/ns5/named1.conf.in
+++ b/bin/tests/system/dnssec/ns5/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns5/named2.conf.in b/bin/tests/system/dnssec/ns5/named2.conf.in
index db6b530d0b7..a33cd411238 100644
--- a/bin/tests/system/dnssec/ns5/named2.conf.in
+++ b/bin/tests/system/dnssec/ns5/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns6/named.conf.in b/bin/tests/system/dnssec/ns6/named.conf.in
index 50b42865684..e808a9bd70d 100644
--- a/bin/tests/system/dnssec/ns6/named.conf.in
+++ b/bin/tests/system/dnssec/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2006, 2007, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/ns7/named.conf.in b/bin/tests/system/dnssec/ns7/named.conf.in
index 66142b5ce5e..5764982e7ce 100644
--- a/bin/tests/system/dnssec/ns7/named.conf.in
+++ b/bin/tests/system/dnssec/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2008, 2010, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2008, 2010, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
index c46ed2dfc44..fbf71d7179d 100644
--- a/bin/tests/system/dnssec/prereq.sh
+++ b/bin/tests/system/dnssec/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002, 2004, 2006, 2007, 2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000-2002, 2004, 2006, 2007, 2009, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 908112db3d7..965b82714f3 100644
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 2fa779e7dd1..e9a38b8e4cd 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2002, 2004-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000-2002, 2004-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/clean.sh b/bin/tests/system/dnstap/clean.sh
index b579126ea01..edafbe87bdd 100644
--- a/bin/tests/system/dnstap/clean.sh
+++ b/bin/tests/system/dnstap/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/ns1/named.conf.in b/bin/tests/system/dnstap/ns1/named.conf.in
index ad0568f86be..f9d5b818457 100644
--- a/bin/tests/system/dnstap/ns1/named.conf.in
+++ b/bin/tests/system/dnstap/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/ns2/named.conf.in b/bin/tests/system/dnstap/ns2/named.conf.in
index 3b9761e6fcc..e7090945c5f 100644
--- a/bin/tests/system/dnstap/ns2/named.conf.in
+++ b/bin/tests/system/dnstap/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/ns3/named.conf.in b/bin/tests/system/dnstap/ns3/named.conf.in
index ab7beec1e34..15d3a23aadb 100644
--- a/bin/tests/system/dnstap/ns3/named.conf.in
+++ b/bin/tests/system/dnstap/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/ns4/named.conf.in b/bin/tests/system/dnstap/ns4/named.conf.in
index b03004dd521..e9ed3b13262 100644
--- a/bin/tests/system/dnstap/ns4/named.conf.in
+++ b/bin/tests/system/dnstap/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/setup.sh b/bin/tests/system/dnstap/setup.sh
index a3303c31178..7d0bc272e02 100644
--- a/bin/tests/system/dnstap/setup.sh
+++ b/bin/tests/system/dnstap/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index ce38a77d299..ec59d4fa573 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dnstap/ydump.py b/bin/tests/system/dnstap/ydump.py
index 781e2e6ce88..4b34b943ddd 100644
--- a/bin/tests/system/dnstap/ydump.py
+++ b/bin/tests/system/dnstap/ydump.py
@@ -1,5 +1,5 @@
 ############################################################################
-# Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/clean.sh b/bin/tests/system/dscp/clean.sh
index dad74f90f79..18acb61e0ee 100644
--- a/bin/tests/system/dscp/clean.sh
+++ b/bin/tests/system/dscp/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/ns1/named.conf.in b/bin/tests/system/dscp/ns1/named.conf.in
index a78070c8221..90286f97eea 100644
--- a/bin/tests/system/dscp/ns1/named.conf.in
+++ b/bin/tests/system/dscp/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/ns2/named.conf.in b/bin/tests/system/dscp/ns2/named.conf.in
index f251d1ddaac..14a24b9e66d 100644
--- a/bin/tests/system/dscp/ns2/named.conf.in
+++ b/bin/tests/system/dscp/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/ns3/named.conf.in b/bin/tests/system/dscp/ns3/named.conf.in
index 18d1c4ef127..d21fa2c896a 100644
--- a/bin/tests/system/dscp/ns3/named.conf.in
+++ b/bin/tests/system/dscp/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/ns4/named.conf.in b/bin/tests/system/dscp/ns4/named.conf.in
index 9e4272ee08b..6fb070bc24d 100644
--- a/bin/tests/system/dscp/ns4/named.conf.in
+++ b/bin/tests/system/dscp/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/ns5/named.conf.in b/bin/tests/system/dscp/ns5/named.conf.in
index c9c8eaff7fa..384d73a9144 100644
--- a/bin/tests/system/dscp/ns5/named.conf.in
+++ b/bin/tests/system/dscp/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/ns6/named.conf.in b/bin/tests/system/dscp/ns6/named.conf.in
index 85802568baf..5b5d6c6a185 100644
--- a/bin/tests/system/dscp/ns6/named.conf.in
+++ b/bin/tests/system/dscp/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/ns7/named.conf.in b/bin/tests/system/dscp/ns7/named.conf.in
index 9827dabb2b4..174bc83b7b9 100644
--- a/bin/tests/system/dscp/ns7/named.conf.in
+++ b/bin/tests/system/dscp/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/setup.sh b/bin/tests/system/dscp/setup.sh
index b457ad11763..765c969dc2f 100644
--- a/bin/tests/system/dscp/setup.sh
+++ b/bin/tests/system/dscp/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dscp/tests.sh b/bin/tests/system/dscp/tests.sh
index b61181fad62..03072fa7167 100644
--- a/bin/tests/system/dscp/tests.sh
+++ b/bin/tests/system/dscp/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/clean.sh b/bin/tests/system/dsdigest/clean.sh
index a2db72cb0dc..92f861020ce 100644
--- a/bin/tests/system/dsdigest/clean.sh
+++ b/bin/tests/system/dsdigest/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/ns1/named.conf.in b/bin/tests/system/dsdigest/ns1/named.conf.in
index b62812b28b6..aed8dc93861 100644
--- a/bin/tests/system/dsdigest/ns1/named.conf.in
+++ b/bin/tests/system/dsdigest/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/ns2/named.conf.in b/bin/tests/system/dsdigest/ns2/named.conf.in
index 4e6d7c9ff96..5b369ef7962 100644
--- a/bin/tests/system/dsdigest/ns2/named.conf.in
+++ b/bin/tests/system/dsdigest/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/ns3/named.conf.in b/bin/tests/system/dsdigest/ns3/named.conf.in
index 5c43bf07eb1..3949bc1822f 100644
--- a/bin/tests/system/dsdigest/ns3/named.conf.in
+++ b/bin/tests/system/dsdigest/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/ns4/named.conf.in b/bin/tests/system/dsdigest/ns4/named.conf.in
index 894f287ac41..d68d4045d25 100644
--- a/bin/tests/system/dsdigest/ns4/named.conf.in
+++ b/bin/tests/system/dsdigest/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/prereq.sh b/bin/tests/system/dsdigest/prereq.sh
index f726d1f3904..e74e41dd69d 100644
--- a/bin/tests/system/dsdigest/prereq.sh
+++ b/bin/tests/system/dsdigest/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh
index ea9e25c1814..47cfbf02793 100644
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dsdigest/tests.sh b/bin/tests/system/dsdigest/tests.sh
index 3e911cd6c8f..ed469395654 100644
--- a/bin/tests/system/dsdigest/tests.sh
+++ b/bin/tests/system/dsdigest/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dyndb/clean.sh b/bin/tests/system/dyndb/clean.sh
index 5738bd1ab6f..97b821fa68e 100644
--- a/bin/tests/system/dyndb/clean.sh
+++ b/bin/tests/system/dyndb/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dyndb/ns1/named.conf.in b/bin/tests/system/dyndb/ns1/named.conf.in
index a6cbe9f6c1f..937595c2124 100644
--- a/bin/tests/system/dyndb/ns1/named.conf.in
+++ b/bin/tests/system/dyndb/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dyndb/prereq.sh b/bin/tests/system/dyndb/prereq.sh
index 4ec63799a40..30d9f6fa857 100644
--- a/bin/tests/system/dyndb/prereq.sh
+++ b/bin/tests/system/dyndb/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dyndb/setup.sh b/bin/tests/system/dyndb/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/dyndb/setup.sh
+++ b/bin/tests/system/dyndb/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh
index 9a4850ddf66..ef288703ae7 100644
--- a/bin/tests/system/dyndb/tests.sh
+++ b/bin/tests/system/dyndb/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ednscompliance/clean.sh b/bin/tests/system/ednscompliance/clean.sh
index 7d8953b3bf7..10d07154f95 100644
--- a/bin/tests/system/ednscompliance/clean.sh
+++ b/bin/tests/system/ednscompliance/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ednscompliance/ns1/named.conf.in b/bin/tests/system/ednscompliance/ns1/named.conf.in
index 8acb655f206..39c62dab1bc 100644
--- a/bin/tests/system/ednscompliance/ns1/named.conf.in
+++ b/bin/tests/system/ednscompliance/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ednscompliance/setup.sh b/bin/tests/system/ednscompliance/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/ednscompliance/setup.sh
+++ b/bin/tests/system/ednscompliance/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ednscompliance/tests.sh b/bin/tests/system/ednscompliance/tests.sh
index fbff953bfd8..2184e1201b7 100644
--- a/bin/tests/system/ednscompliance/tests.sh
+++ b/bin/tests/system/ednscompliance/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/emptyzones/ns1/named1.conf.in b/bin/tests/system/emptyzones/ns1/named1.conf.in
index 08a3391725b..701b0b29935 100644
--- a/bin/tests/system/emptyzones/ns1/named1.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/emptyzones/ns1/named2.conf.in b/bin/tests/system/emptyzones/ns1/named2.conf.in
index 4e447e81e1b..9c609191e53 100644
--- a/bin/tests/system/emptyzones/ns1/named2.conf.in
+++ b/bin/tests/system/emptyzones/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/emptyzones/setup.sh b/bin/tests/system/emptyzones/setup.sh
index 369ecfb8f6d..2ee09258d21 100644
--- a/bin/tests/system/emptyzones/setup.sh
+++ b/bin/tests/system/emptyzones/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/emptyzones/tests.sh b/bin/tests/system/emptyzones/tests.sh
index 5afea2f9704..11d455d1813 100644
--- a/bin/tests/system/emptyzones/tests.sh
+++ b/bin/tests/system/emptyzones/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/ans4/ans.pl b/bin/tests/system/fetchlimit/ans4/ans.pl
index 0ca46a7da4f..d553061f588 100644
--- a/bin/tests/system/fetchlimit/ans4/ans.pl
+++ b/bin/tests/system/fetchlimit/ans4/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/clean.sh b/bin/tests/system/fetchlimit/clean.sh
index 28eb3b0fadb..7fc546ab35a 100644
--- a/bin/tests/system/fetchlimit/clean.sh
+++ b/bin/tests/system/fetchlimit/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.in b/bin/tests/system/fetchlimit/ns1/named.conf.in
index dde59939b94..85f2793b1d8 100644
--- a/bin/tests/system/fetchlimit/ns1/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.in b/bin/tests/system/fetchlimit/ns2/named.conf.in
index f5392a622c3..0f3bd7d398f 100644
--- a/bin/tests/system/fetchlimit/ns2/named.conf.in
+++ b/bin/tests/system/fetchlimit/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
index aee7ae0e67c..92ea1b6478e 100644
--- a/bin/tests/system/fetchlimit/ns3/named1.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in
index 7895ae971ef..0528964f8a2 100644
--- a/bin/tests/system/fetchlimit/ns3/named2.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in
index 8769ba4f4f2..ab2f20d4b88 100644
--- a/bin/tests/system/fetchlimit/ns3/named3.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/setup.sh b/bin/tests/system/fetchlimit/setup.sh
index 52f8f9a92e0..e65f276b9df 100644
--- a/bin/tests/system/fetchlimit/setup.sh
+++ b/bin/tests/system/fetchlimit/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh
index d5eccbf3695..16cd667b781 100644
--- a/bin/tests/system/fetchlimit/tests.sh
+++ b/bin/tests/system/fetchlimit/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/clean.sh b/bin/tests/system/filter-aaaa/clean.sh
index 75ef1e7daf5..7d7d3b5a9e6 100644
--- a/bin/tests/system/filter-aaaa/clean.sh
+++ b/bin/tests/system/filter-aaaa/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
index 9adeabcd864..a96558aeda6 100644
--- a/bin/tests/system/filter-aaaa/ns1/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
index c9ba163dcf0..6af4f2aab9c 100644
--- a/bin/tests/system/filter-aaaa/ns1/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh
index 8ade43ab90c..ae65a651e21 100755
--- a/bin/tests/system/filter-aaaa/ns1/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns2/named1.conf.in b/bin/tests/system/filter-aaaa/ns2/named1.conf.in
index 1bfec194776..f6131402a40 100644
--- a/bin/tests/system/filter-aaaa/ns2/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns2/named2.conf.in b/bin/tests/system/filter-aaaa/ns2/named2.conf.in
index a92bfa8649d..46a9de11d93 100644
--- a/bin/tests/system/filter-aaaa/ns2/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns2/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns3/named1.conf.in b/bin/tests/system/filter-aaaa/ns3/named1.conf.in
index fc959ee8f31..4222adb6314 100644
--- a/bin/tests/system/filter-aaaa/ns3/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns3/named2.conf.in b/bin/tests/system/filter-aaaa/ns3/named2.conf.in
index 17e952f7d7a..194ff3412e2 100644
--- a/bin/tests/system/filter-aaaa/ns3/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns4/named1.conf.in b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
index b5b8b9a7972..70dfc52e451 100644
--- a/bin/tests/system/filter-aaaa/ns4/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns4/named2.conf.in b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
index 2703bfd9ade..a95f4a77bea 100644
--- a/bin/tests/system/filter-aaaa/ns4/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns4/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter-aaaa/ns4/sign.sh
index 8ade43ab90c..ae65a651e21 100755
--- a/bin/tests/system/filter-aaaa/ns4/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns4/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh
index 96a12057745..5610a4b88b0 100644
--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh
index dfc3f332fd1..15c706bb94e 100644
--- a/bin/tests/system/filter-aaaa/tests.sh
+++ b/bin/tests/system/filter-aaaa/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/formerr/clean.sh b/bin/tests/system/formerr/clean.sh
index f8632839983..7d1b79751da 100644
--- a/bin/tests/system/formerr/clean.sh
+++ b/bin/tests/system/formerr/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/formerr/ns1/named.conf.in b/bin/tests/system/formerr/ns1/named.conf.in
index 14b80cf29dd..eac82c835db 100644
--- a/bin/tests/system/formerr/ns1/named.conf.in
+++ b/bin/tests/system/formerr/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/formerr/setup.sh b/bin/tests/system/formerr/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/formerr/setup.sh
+++ b/bin/tests/system/formerr/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/formerr/tests.sh b/bin/tests/system/formerr/tests.sh
index fc30f152e32..8ef198c7bb1 100644
--- a/bin/tests/system/formerr/tests.sh
+++ b/bin/tests/system/formerr/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh
index 768f0cba83e..50fd793d26a 100644
--- a/bin/tests/system/forward/clean.sh
+++ b/bin/tests/system/forward/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in
index 66fc17f0447..28c793bc749 100644
--- a/bin/tests/system/forward/ns1/named.conf.in
+++ b/bin/tests/system/forward/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in
index 987da8e868f..b60563c032b 100644
--- a/bin/tests/system/forward/ns2/named.conf.in
+++ b/bin/tests/system/forward/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/ns3/named.conf.in b/bin/tests/system/forward/ns3/named.conf.in
index b0e579130bd..92f1ef48c04 100644
--- a/bin/tests/system/forward/ns3/named.conf.in
+++ b/bin/tests/system/forward/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/ns4/named.conf.in b/bin/tests/system/forward/ns4/named.conf.in
index e23503c11a7..26cfce64f80 100644
--- a/bin/tests/system/forward/ns4/named.conf.in
+++ b/bin/tests/system/forward/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/ns5/named.conf.in b/bin/tests/system/forward/ns5/named.conf.in
index 5e37f0fec21..4bf6fa1e455 100644
--- a/bin/tests/system/forward/ns5/named.conf.in
+++ b/bin/tests/system/forward/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/setup.sh b/bin/tests/system/forward/setup.sh
index 01a86be617a..b9d74dbe5fd 100644
--- a/bin/tests/system/forward/setup.sh
+++ b/bin/tests/system/forward/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index bf24c881b58..96fbd675528 100644
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named1.conf.in b/bin/tests/system/geoip/ns2/named1.conf.in
index 95e3a5f19e5..fe22e58a42d 100644
--- a/bin/tests/system/geoip/ns2/named1.conf.in
+++ b/bin/tests/system/geoip/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named10.conf.in b/bin/tests/system/geoip/ns2/named10.conf.in
index c27dd1e8573..c0d74852243 100644
--- a/bin/tests/system/geoip/ns2/named10.conf.in
+++ b/bin/tests/system/geoip/ns2/named10.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named11.conf.in b/bin/tests/system/geoip/ns2/named11.conf.in
index fe883bbd6d5..b9bc23889f8 100644
--- a/bin/tests/system/geoip/ns2/named11.conf.in
+++ b/bin/tests/system/geoip/ns2/named11.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named12.conf.in b/bin/tests/system/geoip/ns2/named12.conf.in
index fc22b18a655..723ae217f9f 100644
--- a/bin/tests/system/geoip/ns2/named12.conf.in
+++ b/bin/tests/system/geoip/ns2/named12.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named13.conf.in b/bin/tests/system/geoip/ns2/named13.conf.in
index 561c103fed8..3dd92d3a0a8 100644
--- a/bin/tests/system/geoip/ns2/named13.conf.in
+++ b/bin/tests/system/geoip/ns2/named13.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named14.conf.in b/bin/tests/system/geoip/ns2/named14.conf.in
index 1d4c8cb96d7..0d7776b4f9e 100644
--- a/bin/tests/system/geoip/ns2/named14.conf.in
+++ b/bin/tests/system/geoip/ns2/named14.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named15.conf.in b/bin/tests/system/geoip/ns2/named15.conf.in
index 3e86d7dae0a..cd041e9c9d2 100644
--- a/bin/tests/system/geoip/ns2/named15.conf.in
+++ b/bin/tests/system/geoip/ns2/named15.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named2.conf.in b/bin/tests/system/geoip/ns2/named2.conf.in
index 0fe7589c600..e497e14d7d5 100644
--- a/bin/tests/system/geoip/ns2/named2.conf.in
+++ b/bin/tests/system/geoip/ns2/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named3.conf.in b/bin/tests/system/geoip/ns2/named3.conf.in
index 1a131508a4a..6e2da2a299d 100644
--- a/bin/tests/system/geoip/ns2/named3.conf.in
+++ b/bin/tests/system/geoip/ns2/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named4.conf.in b/bin/tests/system/geoip/ns2/named4.conf.in
index 9fb4afc4162..64b30fbfb38 100644
--- a/bin/tests/system/geoip/ns2/named4.conf.in
+++ b/bin/tests/system/geoip/ns2/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named5.conf.in b/bin/tests/system/geoip/ns2/named5.conf.in
index b6de81dbc41..6a670a6d426 100644
--- a/bin/tests/system/geoip/ns2/named5.conf.in
+++ b/bin/tests/system/geoip/ns2/named5.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named6.conf.in b/bin/tests/system/geoip/ns2/named6.conf.in
index 9e886c38208..1696bde98c4 100644
--- a/bin/tests/system/geoip/ns2/named6.conf.in
+++ b/bin/tests/system/geoip/ns2/named6.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named7.conf.in b/bin/tests/system/geoip/ns2/named7.conf.in
index 0aa4e447b30..f70ecc62730 100644
--- a/bin/tests/system/geoip/ns2/named7.conf.in
+++ b/bin/tests/system/geoip/ns2/named7.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named8.conf.in b/bin/tests/system/geoip/ns2/named8.conf.in
index 4fefb8a26d1..c9fc07318f9 100644
--- a/bin/tests/system/geoip/ns2/named8.conf.in
+++ b/bin/tests/system/geoip/ns2/named8.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/ns2/named9.conf.in b/bin/tests/system/geoip/ns2/named9.conf.in
index 7214b9ed479..9c76a51a6bd 100644
--- a/bin/tests/system/geoip/ns2/named9.conf.in
+++ b/bin/tests/system/geoip/ns2/named9.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/prereq.sh b/bin/tests/system/geoip/prereq.sh
index b84d57ad072..d89b2e586de 100644
--- a/bin/tests/system/geoip/prereq.sh
+++ b/bin/tests/system/geoip/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/setup.sh b/bin/tests/system/geoip/setup.sh
index 77218489e57..3d0be451496 100644
--- a/bin/tests/system/geoip/setup.sh
+++ b/bin/tests/system/geoip/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/geoip/tests.sh b/bin/tests/system/geoip/tests.sh
index 32cac888b5e..3e2d5c7f2c4 100644
--- a/bin/tests/system/geoip/tests.sh
+++ b/bin/tests/system/geoip/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index c547cb9326b..0f80c5c6083 100644
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/glue/ns1/named.conf.in b/bin/tests/system/glue/ns1/named.conf.in
index e93db18f7e8..d2850c100fc 100644
--- a/bin/tests/system/glue/ns1/named.conf.in
+++ b/bin/tests/system/glue/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 9dfd4fb8f6a..65be1979ffa 100644
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index 531793dfdb9..9a511f1e22b 100644
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2003, 2004, 2007, 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2003, 2004, 2007, 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns1/named.conf.in b/bin/tests/system/inline/ns1/named.conf.in
index 2f3fffc3db9..d097229ac24 100644
--- a/bin/tests/system/inline/ns1/named.conf.in
+++ b/bin/tests/system/inline/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns2/named.conf.in b/bin/tests/system/inline/ns2/named.conf.in
index 391395c677b..daf0152bb67 100644
--- a/bin/tests/system/inline/ns2/named.conf.in
+++ b/bin/tests/system/inline/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns3/named.conf.in b/bin/tests/system/inline/ns3/named.conf.in
index 0a11511a3f8..ca79fd1c394 100644
--- a/bin/tests/system/inline/ns3/named.conf.in
+++ b/bin/tests/system/inline/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns4/named.conf.in b/bin/tests/system/inline/ns4/named.conf.in
index d30bda7b1a3..296ccd8c719 100644
--- a/bin/tests/system/inline/ns4/named.conf.in
+++ b/bin/tests/system/inline/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns5/named.conf.post b/bin/tests/system/inline/ns5/named.conf.post
index 7f6a8b97130..d59679fa29b 100644
--- a/bin/tests/system/inline/ns5/named.conf.post
+++ b/bin/tests/system/inline/ns5/named.conf.post
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns5/named.conf.pre b/bin/tests/system/inline/ns5/named.conf.pre
index 94255fa3d8f..d7f4515ecb7 100644
--- a/bin/tests/system/inline/ns5/named.conf.pre
+++ b/bin/tests/system/inline/ns5/named.conf.pre
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns6/named.conf.in b/bin/tests/system/inline/ns6/named.conf.in
index 20ad53002ea..e5c1684e921 100644
--- a/bin/tests/system/inline/ns6/named.conf.in
+++ b/bin/tests/system/inline/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/ns7/named.conf.in b/bin/tests/system/inline/ns7/named.conf.in
index 4540b9aed3a..61ab4f20706 100644
--- a/bin/tests/system/inline/ns7/named.conf.in
+++ b/bin/tests/system/inline/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh
index f53833fd3bd..4ae7bf80e42 100644
--- a/bin/tests/system/inline/setup.sh
+++ b/bin/tests/system/inline/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/integrity/clean.sh b/bin/tests/system/integrity/clean.sh
index 409ea83ef51..ac4cb6a0e48 100644
--- a/bin/tests/system/integrity/clean.sh
+++ b/bin/tests/system/integrity/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/integrity/ns1/named.conf.in b/bin/tests/system/integrity/ns1/named.conf.in
index 4076214bbd0..426b3fd7541 100644
--- a/bin/tests/system/integrity/ns1/named.conf.in
+++ b/bin/tests/system/integrity/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/integrity/setup.sh b/bin/tests/system/integrity/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/integrity/setup.sh
+++ b/bin/tests/system/integrity/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/integrity/tests.sh b/bin/tests/system/integrity/tests.sh
index eac1f113dec..95c57ed3d94 100644
--- a/bin/tests/system/integrity/tests.sh
+++ b/bin/tests/system/integrity/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh
index d05798901e3..4b157e5c562 100644
--- a/bin/tests/system/ixfr/clean.sh
+++ b/bin/tests/system/ixfr/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ixfr/ns3/named.conf.in b/bin/tests/system/ixfr/ns3/named.conf.in
index 4dd73c3f274..687d27dc4e5 100644
--- a/bin/tests/system/ixfr/ns3/named.conf.in
+++ b/bin/tests/system/ixfr/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ixfr/ns4/named.conf.in b/bin/tests/system/ixfr/ns4/named.conf.in
index 848542c59e7..57773e83b03 100644
--- a/bin/tests/system/ixfr/ns4/named.conf.in
+++ b/bin/tests/system/ixfr/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh
index 1091ea833db..f60aa793062 100644
--- a/bin/tests/system/ixfr/prereq.sh
+++ b/bin/tests/system/ixfr/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index 44c0b53a7dd..bf9bc8d2327 100644
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index 91dbc51b6a2..c210a5c5ec2 100644
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keepalive/clean.sh b/bin/tests/system/keepalive/clean.sh
index 86b1b388520..c3fd7057cc2 100644
--- a/bin/tests/system/keepalive/clean.sh
+++ b/bin/tests/system/keepalive/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keepalive/ns1/named.conf.in b/bin/tests/system/keepalive/ns1/named.conf.in
index 3925fdba40f..d8202027874 100644
--- a/bin/tests/system/keepalive/ns1/named.conf.in
+++ b/bin/tests/system/keepalive/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keepalive/ns2/named.conf.in b/bin/tests/system/keepalive/ns2/named.conf.in
index da8860bddb8..eac21a15f08 100644
--- a/bin/tests/system/keepalive/ns2/named.conf.in
+++ b/bin/tests/system/keepalive/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keepalive/ns3/named.conf.in b/bin/tests/system/keepalive/ns3/named.conf.in
index 4f0d80607b8..1ed1fd02a95 100644
--- a/bin/tests/system/keepalive/ns3/named.conf.in
+++ b/bin/tests/system/keepalive/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keepalive/setup.sh b/bin/tests/system/keepalive/setup.sh
index f8ef06b98b9..15d49fa5ab4 100644
--- a/bin/tests/system/keepalive/setup.sh
+++ b/bin/tests/system/keepalive/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keymgr/prereq.sh b/bin/tests/system/keymgr/prereq.sh
index 673708b806f..8c9ecd69ab1 100644
--- a/bin/tests/system/keymgr/prereq.sh
+++ b/bin/tests/system/keymgr/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keymgr/setup.sh b/bin/tests/system/keymgr/setup.sh
index 2faa29a0db3..45b17f55a68 100644
--- a/bin/tests/system/keymgr/setup.sh
+++ b/bin/tests/system/keymgr/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/keymgr/tests.sh b/bin/tests/system/keymgr/tests.sh
index c5192a5628a..16e3c4bbfd2 100644
--- a/bin/tests/system/keymgr/tests.sh
+++ b/bin/tests/system/keymgr/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/clean.sh b/bin/tests/system/legacy/clean.sh
index a711c9b62a9..aaac0db1e7a 100644
--- a/bin/tests/system/legacy/clean.sh
+++ b/bin/tests/system/legacy/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in
index 6cf0e5f333a..5c85935ab14 100644
--- a/bin/tests/system/legacy/ns1/named1.conf.in
+++ b/bin/tests/system/legacy/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns1/named2.conf.in b/bin/tests/system/legacy/ns1/named2.conf.in
index 8c150287abc..266a479124d 100644
--- a/bin/tests/system/legacy/ns1/named2.conf.in
+++ b/bin/tests/system/legacy/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns2/named.conf.in b/bin/tests/system/legacy/ns2/named.conf.in
index a3823b0505c..47396f20809 100644
--- a/bin/tests/system/legacy/ns2/named.conf.in
+++ b/bin/tests/system/legacy/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns3/named.conf.in b/bin/tests/system/legacy/ns3/named.conf.in
index cb319c3efff..f05b9fa3022 100644
--- a/bin/tests/system/legacy/ns3/named.conf.in
+++ b/bin/tests/system/legacy/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns4/named.conf.in b/bin/tests/system/legacy/ns4/named.conf.in
index 8285ea033d7..521d99f8632 100644
--- a/bin/tests/system/legacy/ns4/named.conf.in
+++ b/bin/tests/system/legacy/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns5/named.conf.in b/bin/tests/system/legacy/ns5/named.conf.in
index 99d7b31704b..bf8ca15664b 100644
--- a/bin/tests/system/legacy/ns5/named.conf.in
+++ b/bin/tests/system/legacy/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns6/named.conf.in b/bin/tests/system/legacy/ns6/named.conf.in
index 7a095e3cc83..37368125fbf 100644
--- a/bin/tests/system/legacy/ns6/named.conf.in
+++ b/bin/tests/system/legacy/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns6/sign.sh b/bin/tests/system/legacy/ns6/sign.sh
index 212243b7722..57625d45c96 100755
--- a/bin/tests/system/legacy/ns6/sign.sh
+++ b/bin/tests/system/legacy/ns6/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns7/named.conf.in b/bin/tests/system/legacy/ns7/named.conf.in
index 6c3b53d425c..df2696ead43 100644
--- a/bin/tests/system/legacy/ns7/named.conf.in
+++ b/bin/tests/system/legacy/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/ns7/sign.sh b/bin/tests/system/legacy/ns7/sign.sh
index 63507f2facf..bc283da4269 100755
--- a/bin/tests/system/legacy/ns7/sign.sh
+++ b/bin/tests/system/legacy/ns7/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/setup.sh b/bin/tests/system/legacy/setup.sh
index 8a2c961f144..9f545ac2c0e 100644
--- a/bin/tests/system/legacy/setup.sh
+++ b/bin/tests/system/legacy/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh
index fa042ef48cf..e5e0ef7f3cd 100755
--- a/bin/tests/system/legacy/tests.sh
+++ b/bin/tests/system/legacy/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh
index 0eeb38e7942..a6ab97e2ef4 100644
--- a/bin/tests/system/limits/clean.sh
+++ b/bin/tests/system/limits/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/limits/ns1/named.conf.in b/bin/tests/system/limits/ns1/named.conf.in
index ef88cd93dbe..fda9c559cd8 100644
--- a/bin/tests/system/limits/ns1/named.conf.in
+++ b/bin/tests/system/limits/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/limits/setup.sh b/bin/tests/system/limits/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/limits/setup.sh
+++ b/bin/tests/system/limits/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh
index 14ed1c935a4..7be75eaa3b4 100644
--- a/bin/tests/system/limits/tests.sh
+++ b/bin/tests/system/limits/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index 6cc8ffcbd87..32d4abb479e 100644
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/controls.conf.in b/bin/tests/system/logfileconfig/ns1/controls.conf.in
index bc5b1101512..fe7e97ea1a3 100644
--- a/bin/tests/system/logfileconfig/ns1/controls.conf.in
+++ b/bin/tests/system/logfileconfig/ns1/controls.conf.in
@@ -7,7 +7,7 @@
  */
 
 controls {
-        inet 127.0.0.1 port @CONTROLPORT@
-                allow { 127.0.0.1/32; ::1/128; }
-                keys { "rndc-key"; };
+	inet 127.0.0.1 port @CONTROLPORT@
+		allow { 127.0.0.1/32; ::1/128; }
+		keys { "rndc-key"; };
 };
diff --git a/bin/tests/system/logfileconfig/ns1/named.dirconf b/bin/tests/system/logfileconfig/ns1/named.dirconf
index 6dc80df2431..023bd588da2 100644
--- a/bin/tests/system/logfileconfig/ns1/named.dirconf
+++ b/bin/tests/system/logfileconfig/ns1/named.dirconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601 b/bin/tests/system/logfileconfig/ns1/named.iso8601
index 555d87b2e71..d089184696f 100644
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
index 4d8e6782bbc..37a6ecf9041 100644
--- a/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
+++ b/bin/tests/system/logfileconfig/ns1/named.iso8601-utc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.pipeconf b/bin/tests/system/logfileconfig/ns1/named.pipeconf
index 61258dc14d0..417694ef1a7 100644
--- a/bin/tests/system/logfileconfig/ns1/named.pipeconf
+++ b/bin/tests/system/logfileconfig/ns1/named.pipeconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.plain b/bin/tests/system/logfileconfig/ns1/named.plain
index 4372788a5f4..0b3a2335326 100644
--- a/bin/tests/system/logfileconfig/ns1/named.plain
+++ b/bin/tests/system/logfileconfig/ns1/named.plain
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.plainconf b/bin/tests/system/logfileconfig/ns1/named.plainconf
index bafe9bf1a57..56ff0d4d775 100644
--- a/bin/tests/system/logfileconfig/ns1/named.plainconf
+++ b/bin/tests/system/logfileconfig/ns1/named.plainconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.symconf b/bin/tests/system/logfileconfig/ns1/named.symconf
index d13e33b397f..5ffb5a7d1fe 100644
--- a/bin/tests/system/logfileconfig/ns1/named.symconf
+++ b/bin/tests/system/logfileconfig/ns1/named.symconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.tsconf b/bin/tests/system/logfileconfig/ns1/named.tsconf
index b8b0dfabc08..09b943fcca8 100644
--- a/bin/tests/system/logfileconfig/ns1/named.tsconf
+++ b/bin/tests/system/logfileconfig/ns1/named.tsconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.unlimited b/bin/tests/system/logfileconfig/ns1/named.unlimited
index 4d6e007f185..7add1f53ca9 100644
--- a/bin/tests/system/logfileconfig/ns1/named.unlimited
+++ b/bin/tests/system/logfileconfig/ns1/named.unlimited
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/named.versconf b/bin/tests/system/logfileconfig/ns1/named.versconf
index 2fc040db973..e07656a8b52 100644
--- a/bin/tests/system/logfileconfig/ns1/named.versconf
+++ b/bin/tests/system/logfileconfig/ns1/named.versconf
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/ns1/rndc.conf.in b/bin/tests/system/logfileconfig/ns1/rndc.conf.in
index 0fa1909a010..665438be27b 100644
--- a/bin/tests/system/logfileconfig/ns1/rndc.conf.in
+++ b/bin/tests/system/logfileconfig/ns1/rndc.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh
index c115a219df7..7028e7564a8 100644
--- a/bin/tests/system/logfileconfig/setup.sh
+++ b/bin/tests/system/logfileconfig/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh
index 631c15af82b..33734965e23 100644
--- a/bin/tests/system/logfileconfig/tests.sh
+++ b/bin/tests/system/logfileconfig/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh
index 00e4c6ee5ad..a360fd071ee 100644
--- a/bin/tests/system/masterfile/clean.sh
+++ b/bin/tests/system/masterfile/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2010, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2010, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterfile/ns1/named.conf.in b/bin/tests/system/masterfile/ns1/named.conf.in
index 2b6d32b7e63..2e70433a682 100644
--- a/bin/tests/system/masterfile/ns1/named.conf.in
+++ b/bin/tests/system/masterfile/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.in
index 627f0ee5869..7762780b577 100644
--- a/bin/tests/system/masterfile/ns2/named.conf.in
+++ b/bin/tests/system/masterfile/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterfile/setup.sh b/bin/tests/system/masterfile/setup.sh
index d4f9dbc3588..c72b22a8139 100644
--- a/bin/tests/system/masterfile/setup.sh
+++ b/bin/tests/system/masterfile/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh
index 2cb625a484b..11d2c23166c 100644
--- a/bin/tests/system/masterfile/tests.sh
+++ b/bin/tests/system/masterfile/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2004, 2007, 2010, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004, 2007, 2010, 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index dcefefe6027..9281c7932a1 100755
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterformat/ns1/named.conf.in b/bin/tests/system/masterformat/ns1/named.conf.in
index ce8d638a6a9..b2c88a59b5d 100644
--- a/bin/tests/system/masterformat/ns1/named.conf.in
+++ b/bin/tests/system/masterformat/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterformat/ns2/named.conf.in b/bin/tests/system/masterformat/ns2/named.conf.in
index aa4dbe8a925..d108882bbc4 100644
--- a/bin/tests/system/masterformat/ns2/named.conf.in
+++ b/bin/tests/system/masterformat/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005, 2007, 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterformat/ns3/named.conf.in b/bin/tests/system/masterformat/ns3/named.conf.in
index 71dbc8edb8f..dc515e008dd 100644
--- a/bin/tests/system/masterformat/ns3/named.conf.in
+++ b/bin/tests/system/masterformat/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index fa6045a41dc..df4902b6bad 100755
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2007, 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005-2007, 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index a4be90ddf9c..a65b4a9a302 100755
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2005, 2007, 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2005, 2007, 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index 5c1435d76d6..922537f46b1 100644
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2011, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2011, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh
index 3008416e6c7..1764436707e 100644
--- a/bin/tests/system/metadata/tests.sh
+++ b/bin/tests/system/metadata/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh
index b3242aca1f5..a272384080e 100644
--- a/bin/tests/system/mkeys/clean.sh
+++ b/bin/tests/system/mkeys/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/ns1/named1.conf.in b/bin/tests/system/mkeys/ns1/named1.conf.in
index 28aafb82cf2..f708d21a0b8 100644
--- a/bin/tests/system/mkeys/ns1/named1.conf.in
+++ b/bin/tests/system/mkeys/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/ns1/named2.conf.in b/bin/tests/system/mkeys/ns1/named2.conf.in
index dafdc629254..a38b8f988a5 100644
--- a/bin/tests/system/mkeys/ns1/named2.conf.in
+++ b/bin/tests/system/mkeys/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/ns1/named3.conf.in b/bin/tests/system/mkeys/ns1/named3.conf.in
index 39f7b7dcd0a..d7d86fcce8a 100644
--- a/bin/tests/system/mkeys/ns1/named3.conf.in
+++ b/bin/tests/system/mkeys/ns1/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/ns2/named.conf.in b/bin/tests/system/mkeys/ns2/named.conf.in
index ab906aa43a3..c8b6c657951 100644
--- a/bin/tests/system/mkeys/ns2/named.conf.in
+++ b/bin/tests/system/mkeys/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/ns3/named.conf.in b/bin/tests/system/mkeys/ns3/named.conf.in
index d70374b9c27..42049fbb384 100644
--- a/bin/tests/system/mkeys/ns3/named.conf.in
+++ b/bin/tests/system/mkeys/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/ns4/named.conf.in b/bin/tests/system/mkeys/ns4/named.conf.in
index 50bb8753e07..246e4be077f 100644
--- a/bin/tests/system/mkeys/ns4/named.conf.in
+++ b/bin/tests/system/mkeys/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/ns5/named.conf.in b/bin/tests/system/mkeys/ns5/named.conf.in
index 502b0ad548c..a7b7675d218 100644
--- a/bin/tests/system/mkeys/ns5/named.conf.in
+++ b/bin/tests/system/mkeys/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh
index f5c2dc6b7b6..9af917a8457 100644
--- a/bin/tests/system/mkeys/setup.sh
+++ b/bin/tests/system/mkeys/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh
index ec4d57037a4..02ca7de9ada 100644
--- a/bin/tests/system/mkeys/tests.sh
+++ b/bin/tests/system/mkeys/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/names/clean.sh b/bin/tests/system/names/clean.sh
index 3b2ed6e8ca9..9697ff6cd24 100644
--- a/bin/tests/system/names/clean.sh
+++ b/bin/tests/system/names/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/names/ns1/named.conf.in b/bin/tests/system/names/ns1/named.conf.in
index 4c240377d6e..b34875a8c64 100644
--- a/bin/tests/system/names/ns1/named.conf.in
+++ b/bin/tests/system/names/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/names/setup.sh b/bin/tests/system/names/setup.sh
index 18ad02b9541..53066b9e7a2 100644
--- a/bin/tests/system/names/setup.sh
+++ b/bin/tests/system/names/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/names/tests.sh b/bin/tests/system/names/tests.sh
index f4c27346897..45303387757 100644
--- a/bin/tests/system/names/tests.sh
+++ b/bin/tests/system/names/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index 909076b9849..0e8be7ecd3c 100644
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/ns1/named.conf.in b/bin/tests/system/notify/ns1/named.conf.in
index 262fbe93d78..b098ff58af5 100644
--- a/bin/tests/system/notify/ns1/named.conf.in
+++ b/bin/tests/system/notify/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/ns2/named.conf.in b/bin/tests/system/notify/ns2/named.conf.in
index 5f5b9f53b9c..4fe0fc76458 100644
--- a/bin/tests/system/notify/ns2/named.conf.in
+++ b/bin/tests/system/notify/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/ns3/named.conf.in b/bin/tests/system/notify/ns3/named.conf.in
index ce2a749be36..75d37e03603 100644
--- a/bin/tests/system/notify/ns3/named.conf.in
+++ b/bin/tests/system/notify/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/ns4/named.conf.in b/bin/tests/system/notify/ns4/named.conf.in
index a22fbf37cbc..a96a59839ba 100644
--- a/bin/tests/system/notify/ns4/named.conf.in
+++ b/bin/tests/system/notify/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/ns5/named.conf.in b/bin/tests/system/notify/ns5/named.conf.in
index b659a47e4f4..28c7d8a331f 100644
--- a/bin/tests/system/notify/ns5/named.conf.in
+++ b/bin/tests/system/notify/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh
index 1faf322006d..4adfcd87748 100644
--- a/bin/tests/system/notify/setup.sh
+++ b/bin/tests/system/notify/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index 3e7f3d31a1d..5287c594e46 100644
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nslookup/clean.sh b/bin/tests/system/nslookup/clean.sh
index 7cbe9ccc146..a1e694b92c1 100644
--- a/bin/tests/system/nslookup/clean.sh
+++ b/bin/tests/system/nslookup/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nslookup/ns1/named.conf.in b/bin/tests/system/nslookup/ns1/named.conf.in
index 6f8a295bba5..05d49b40061 100644
--- a/bin/tests/system/nslookup/ns1/named.conf.in
+++ b/bin/tests/system/nslookup/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nslookup/setup.sh b/bin/tests/system/nslookup/setup.sh
index cac31d73cf5..862986dfb38 100644
--- a/bin/tests/system/nslookup/setup.sh
+++ b/bin/tests/system/nslookup/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh
index 770f2d4079f..3edd18d2534 100644
--- a/bin/tests/system/nslookup/tests.sh
+++ b/bin/tests/system/nslookup/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/ans4/ans.pl b/bin/tests/system/nsupdate/ans4/ans.pl
index 215d1295f63..4ee6d54f65a 100644
--- a/bin/tests/system/nsupdate/ans4/ans.pl
+++ b/bin/tests/system/nsupdate/ans4/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 8ef818cb030..b860e416f40 100644
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009-2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
index 8d40557d726..02b9233acaa 100644
--- a/bin/tests/system/nsupdate/ns1/named.conf.in
+++ b/bin/tests/system/nsupdate/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2009, 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
index 37e83eeea40..91d0e48f8e5 100644
--- a/bin/tests/system/nsupdate/ns2/named.conf.in
+++ b/bin/tests/system/nsupdate/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/ns3/named.conf.in b/bin/tests/system/nsupdate/ns3/named.conf.in
index 13b2e122561..71ea7e8a67d 100644
--- a/bin/tests/system/nsupdate/ns3/named.conf.in
+++ b/bin/tests/system/nsupdate/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/ns5/named.conf.in b/bin/tests/system/nsupdate/ns5/named.conf.in
index 2d8f13e6f78..60dcd52c96c 100644
--- a/bin/tests/system/nsupdate/ns5/named.conf.in
+++ b/bin/tests/system/nsupdate/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/prereq.sh b/bin/tests/system/nsupdate/prereq.sh
index 15a1ecf3507..0a7fcbe379e 100644
--- a/bin/tests/system/nsupdate/prereq.sh
+++ b/bin/tests/system/nsupdate/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index b6321a91a2c..130e77fe797 100644
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009-2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nsupdate/update_test.pl b/bin/tests/system/nsupdate/update_test.pl
index cbbdeb20a62..ba9ee93e694 100644
--- a/bin/tests/system/nsupdate/update_test.pl
+++ b/bin/tests/system/nsupdate/update_test.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nzd2nzf/clean.sh b/bin/tests/system/nzd2nzf/clean.sh
index 7fcf80b2116..a338e686cfb 100644
--- a/bin/tests/system/nzd2nzf/clean.sh
+++ b/bin/tests/system/nzd2nzf/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nzd2nzf/ns1/named.conf.in b/bin/tests/system/nzd2nzf/ns1/named.conf.in
index a4ba6421f26..fcfbf5b195c 100644
--- a/bin/tests/system/nzd2nzf/ns1/named.conf.in
+++ b/bin/tests/system/nzd2nzf/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nzd2nzf/prereq.sh b/bin/tests/system/nzd2nzf/prereq.sh
index 22cf6f82aba..03e484c08bb 100644
--- a/bin/tests/system/nzd2nzf/prereq.sh
+++ b/bin/tests/system/nzd2nzf/prereq.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nzd2nzf/setup.sh b/bin/tests/system/nzd2nzf/setup.sh
index 158d59b33f3..d864a59d532 100644
--- a/bin/tests/system/nzd2nzf/setup.sh
+++ b/bin/tests/system/nzd2nzf/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh
index 7da1dbfa714..07580bf3182 100644
--- a/bin/tests/system/nzd2nzf/tests.sh
+++ b/bin/tests/system/nzd2nzf/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/padding/clean.sh b/bin/tests/system/padding/clean.sh
index ed8a1e0b786..f9ca7a18285 100644
--- a/bin/tests/system/padding/clean.sh
+++ b/bin/tests/system/padding/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/padding/ns1/named.conf.in b/bin/tests/system/padding/ns1/named.conf.in
index 3925fdba40f..d8202027874 100644
--- a/bin/tests/system/padding/ns1/named.conf.in
+++ b/bin/tests/system/padding/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/padding/ns2/named.conf.in b/bin/tests/system/padding/ns2/named.conf.in
index 36d4fad763a..8ea1d10f5a7 100644
--- a/bin/tests/system/padding/ns2/named.conf.in
+++ b/bin/tests/system/padding/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/padding/ns3/named.conf.in b/bin/tests/system/padding/ns3/named.conf.in
index 6134a1419e8..2f78539606a 100644
--- a/bin/tests/system/padding/ns3/named.conf.in
+++ b/bin/tests/system/padding/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/padding/ns4/named.conf.in b/bin/tests/system/padding/ns4/named.conf.in
index 3ffa3256d21..4c7f094d6a2 100644
--- a/bin/tests/system/padding/ns4/named.conf.in
+++ b/bin/tests/system/padding/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/padding/setup.sh b/bin/tests/system/padding/setup.sh
index 7642dfbe144..051ddd1a64c 100644
--- a/bin/tests/system/padding/setup.sh
+++ b/bin/tests/system/padding/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/padding/tests.sh b/bin/tests/system/padding/tests.sh
index 5eba9478c2b..3df9e5ac9f5 100644
--- a/bin/tests/system/padding/tests.sh
+++ b/bin/tests/system/padding/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pending/clean.sh b/bin/tests/system/pending/clean.sh
index 8317f26b5f5..7ea0eb14a43 100644
--- a/bin/tests/system/pending/clean.sh
+++ b/bin/tests/system/pending/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pending/ns1/named.conf.in b/bin/tests/system/pending/ns1/named.conf.in
index 8b56c3873b3..87c661daf05 100644
--- a/bin/tests/system/pending/ns1/named.conf.in
+++ b/bin/tests/system/pending/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pending/ns2/named.conf.in b/bin/tests/system/pending/ns2/named.conf.in
index 54958d78757..44722999ab9 100644
--- a/bin/tests/system/pending/ns2/named.conf.in
+++ b/bin/tests/system/pending/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pending/ns3/named.conf.in b/bin/tests/system/pending/ns3/named.conf.in
index d7e308384eb..3e1040b7304 100644
--- a/bin/tests/system/pending/ns3/named.conf.in
+++ b/bin/tests/system/pending/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pending/ns4/named.conf.in b/bin/tests/system/pending/ns4/named.conf.in
index e30c796184c..7f72c7a6915 100644
--- a/bin/tests/system/pending/ns4/named.conf.in
+++ b/bin/tests/system/pending/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2009, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index a4a6d5e49f0..af225a04a99 100644
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2009, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh
index c359eb8a906..7b81600c35d 100644
--- a/bin/tests/system/pending/tests.sh
+++ b/bin/tests/system/pending/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2009, 2010, 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2009, 2010, 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/clean.sh b/bin/tests/system/pipelined/clean.sh
index 96d170b2344..569509a8bb5 100644
--- a/bin/tests/system/pipelined/clean.sh
+++ b/bin/tests/system/pipelined/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/ns1/named.conf.in b/bin/tests/system/pipelined/ns1/named.conf.in
index 28b890eb7bf..f3436deb437 100644
--- a/bin/tests/system/pipelined/ns1/named.conf.in
+++ b/bin/tests/system/pipelined/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.in
index 86f09fa7443..9911fe04699 100644
--- a/bin/tests/system/pipelined/ns2/named.conf.in
+++ b/bin/tests/system/pipelined/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.in
index 824afe60ab6..7bdcd8a8883 100644
--- a/bin/tests/system/pipelined/ns3/named.conf.in
+++ b/bin/tests/system/pipelined/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.in
index 8a69a3e2f87..e39c61017f5 100644
--- a/bin/tests/system/pipelined/ns4/named.conf.in
+++ b/bin/tests/system/pipelined/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/pipequeries.c b/bin/tests/system/pipelined/pipequeries.c
index 1fafe094b51..d5960d87474 100644
--- a/bin/tests/system/pipelined/pipequeries.c
+++ b/bin/tests/system/pipelined/pipequeries.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2015, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2015, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/setup.sh b/bin/tests/system/pipelined/setup.sh
index 84609a36f36..5e63647678b 100644
--- a/bin/tests/system/pipelined/setup.sh
+++ b/bin/tests/system/pipelined/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh
index b70f0582902..5f069db67f1 100644
--- a/bin/tests/system/pipelined/tests.sh
+++ b/bin/tests/system/pipelined/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/ans2/ans.pl b/bin/tests/system/reclimit/ans2/ans.pl
index af13dbaa2cc..0c419f27ef8 100644
--- a/bin/tests/system/reclimit/ans2/ans.pl
+++ b/bin/tests/system/reclimit/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/ans7/ans.pl b/bin/tests/system/reclimit/ans7/ans.pl
index 1b7c6619125..945146b4ed7 100644
--- a/bin/tests/system/reclimit/ans7/ans.pl
+++ b/bin/tests/system/reclimit/ans7/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/clean.sh b/bin/tests/system/reclimit/clean.sh
index 12a5a44db3b..5dfa82abf84 100644
--- a/bin/tests/system/reclimit/clean.sh
+++ b/bin/tests/system/reclimit/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/ns1/named.conf.in b/bin/tests/system/reclimit/ns1/named.conf.in
index bd9acc69e7f..3334bd1e7d9 100644
--- a/bin/tests/system/reclimit/ns1/named.conf.in
+++ b/bin/tests/system/reclimit/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/ns3/named1.conf.in b/bin/tests/system/reclimit/ns3/named1.conf.in
index 4751e12ec21..4797eef0c06 100644
--- a/bin/tests/system/reclimit/ns3/named1.conf.in
+++ b/bin/tests/system/reclimit/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/ns3/named2.conf.in b/bin/tests/system/reclimit/ns3/named2.conf.in
index 2521a6dd39f..4e52dcfc427 100644
--- a/bin/tests/system/reclimit/ns3/named2.conf.in
+++ b/bin/tests/system/reclimit/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/ns3/named3.conf.in b/bin/tests/system/reclimit/ns3/named3.conf.in
index 96f6dacaf66..0266e352d89 100644
--- a/bin/tests/system/reclimit/ns3/named3.conf.in
+++ b/bin/tests/system/reclimit/ns3/named3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/ns3/named4.conf.in b/bin/tests/system/reclimit/ns3/named4.conf.in
index 7cec43ea4fe..85c80ff21c0 100644
--- a/bin/tests/system/reclimit/ns3/named4.conf.in
+++ b/bin/tests/system/reclimit/ns3/named4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/prereq.sh b/bin/tests/system/reclimit/prereq.sh
index 1f1349616a5..b6f06d2cad8 100644
--- a/bin/tests/system/reclimit/prereq.sh
+++ b/bin/tests/system/reclimit/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/setup.sh b/bin/tests/system/reclimit/setup.sh
index 7f2b859dec8..2133c34239c 100644
--- a/bin/tests/system/reclimit/setup.sh
+++ b/bin/tests/system/reclimit/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh
index 783b7c9f9e2..9c953c51d46 100644
--- a/bin/tests/system/reclimit/tests.sh
+++ b/bin/tests/system/reclimit/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh
index 3f419d5c14a..ec717b42653 100644
--- a/bin/tests/system/redirect/clean.sh
+++ b/bin/tests/system/redirect/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/redirect/ns1/named.conf.in b/bin/tests/system/redirect/ns1/named.conf.in
index 3acc77a170d..39ad49a3248 100644
--- a/bin/tests/system/redirect/ns1/named.conf.in
+++ b/bin/tests/system/redirect/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in
index 871e650af25..e10a91d186e 100644
--- a/bin/tests/system/redirect/ns2/named.conf.in
+++ b/bin/tests/system/redirect/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/redirect/ns3/named.conf.in b/bin/tests/system/redirect/ns3/named.conf.in
index 5ef9932d0f5..0273d9af43c 100644
--- a/bin/tests/system/redirect/ns3/named.conf.in
+++ b/bin/tests/system/redirect/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/redirect/ns4/named.conf.in b/bin/tests/system/redirect/ns4/named.conf.in
index 68a4ccdf826..078a535b1ba 100644
--- a/bin/tests/system/redirect/ns4/named.conf.in
+++ b/bin/tests/system/redirect/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index 6560c7f21fc..b6af860b8ce 100644
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh
index 56584024f41..e21750595a0 100644
--- a/bin/tests/system/redirect/tests.sh
+++ b/bin/tests/system/redirect/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl
index aea3c8a22c7..1c3c347bf94 100644
--- a/bin/tests/system/resolver/ans2/ans.pl
+++ b/bin/tests/system/resolver/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2010, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2010, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl
index 47f3ddb556e..11c010f457b 100644
--- a/bin/tests/system/resolver/ans3/ans.pl
+++ b/bin/tests/system/resolver/ans3/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ans8/ans.pl b/bin/tests/system/resolver/ans8/ans.pl
index 26736fafb13..09d8a242743 100644
--- a/bin/tests/system/resolver/ans8/ans.pl
+++ b/bin/tests/system/resolver/ans8/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index edca6027955..b40e2bc6f8a 100644
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2008-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2008-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in
index e5c53acde4d..56b0e83d862 100644
--- a/bin/tests/system/resolver/ns1/named.conf.in
+++ b/bin/tests/system/resolver/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2009, 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2009, 2013-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ns4/named.conf.in b/bin/tests/system/resolver/ns4/named.conf.in
index 23329c2051b..cfba424ed0e 100644
--- a/bin/tests/system/resolver/ns4/named.conf.in
+++ b/bin/tests/system/resolver/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010-2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in
index e9008568348..894e1d0b9be 100644
--- a/bin/tests/system/resolver/ns5/named.conf.in
+++ b/bin/tests/system/resolver/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ns6/named.conf.in b/bin/tests/system/resolver/ns6/named.conf.in
index f2b475d0068..326ef789e21 100644
--- a/bin/tests/system/resolver/ns6/named.conf.in
+++ b/bin/tests/system/resolver/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in
index a150b30e18b..5bea0526192 100644
--- a/bin/tests/system/resolver/ns7/named1.conf.in
+++ b/bin/tests/system/resolver/ns7/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in
index bd5362fb5aa..3e8c9be1c34 100644
--- a/bin/tests/system/resolver/ns7/named2.conf.in
+++ b/bin/tests/system/resolver/ns7/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh
index eb62107a66e..aad46df8308 100644
--- a/bin/tests/system/resolver/prereq.sh
+++ b/bin/tests/system/resolver/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index 249f160625f..6a516806d2f 100644
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2010-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 705589847bd..79021b4b3a8 100755
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh
index 9baf2e74cbd..11cd0cd6a9b 100644
--- a/bin/tests/system/rndc/clean.sh
+++ b/bin/tests/system/rndc/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rndc/ns2/named.conf.in b/bin/tests/system/rndc/ns2/named.conf.in
index e36974f84b2..f8f3563d4d4 100644
--- a/bin/tests/system/rndc/ns2/named.conf.in
+++ b/bin/tests/system/rndc/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rndc/ns3/named.conf.in b/bin/tests/system/rndc/ns3/named.conf.in
index b6e4fc5f7ae..b9c72c1e21a 100644
--- a/bin/tests/system/rndc/ns3/named.conf.in
+++ b/bin/tests/system/rndc/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rndc/ns4/named.conf.in b/bin/tests/system/rndc/ns4/named.conf.in
index c8151c448c1..3c90489e4cf 100644
--- a/bin/tests/system/rndc/ns4/named.conf.in
+++ b/bin/tests/system/rndc/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rndc/ns5/named.conf.in b/bin/tests/system/rndc/ns5/named.conf.in
index 4265e9360bf..3b6a11be392 100644
--- a/bin/tests/system/rndc/ns5/named.conf.in
+++ b/bin/tests/system/rndc/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rndc/ns6/named.conf.in b/bin/tests/system/rndc/ns6/named.conf.in
index da25fc6fa53..3ac1e79e01c 100644
--- a/bin/tests/system/rndc/ns6/named.conf.in
+++ b/bin/tests/system/rndc/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index 45da888a5b6..b19de6edef5 100644
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh
index a55ca8cb886..0c5715a8a16 100644
--- a/bin/tests/system/rpz/clean.sh
+++ b/bin/tests/system/rpz/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/dnsrpzd.conf.in b/bin/tests/system/rpz/dnsrpzd.conf.in
index a0c92d44403..0a4a9fd2619 100644
--- a/bin/tests/system/rpz/dnsrpzd.conf.in
+++ b/bin/tests/system/rpz/dnsrpzd.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/ns1/named.conf.in b/bin/tests/system/rpz/ns1/named.conf.in
index 3d2197df11f..51252b4a68e 100644
--- a/bin/tests/system/rpz/ns1/named.conf.in
+++ b/bin/tests/system/rpz/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/ns2/named.conf.in b/bin/tests/system/rpz/ns2/named.conf.in
index a2237bd7ffb..0ff701276d7 100644
--- a/bin/tests/system/rpz/ns2/named.conf.in
+++ b/bin/tests/system/rpz/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in
index 3255f57ccd9..1283275264d 100644
--- a/bin/tests/system/rpz/ns3/named.conf.in
+++ b/bin/tests/system/rpz/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/ns4/named.conf.in b/bin/tests/system/rpz/ns4/named.conf.in
index 46443d57cd6..04f1d16eb0b 100644
--- a/bin/tests/system/rpz/ns4/named.conf.in
+++ b/bin/tests/system/rpz/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011-2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/ns5/named.conf.in b/bin/tests/system/rpz/ns5/named.conf.in
index 33b9c925d10..7c0034f7093 100644
--- a/bin/tests/system/rpz/ns5/named.conf.in
+++ b/bin/tests/system/rpz/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/ns6/named.conf.in b/bin/tests/system/rpz/ns6/named.conf.in
index db9d3ea9370..f4f49369720 100644
--- a/bin/tests/system/rpz/ns6/named.conf.in
+++ b/bin/tests/system/rpz/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/ns7/named.conf.in b/bin/tests/system/rpz/ns7/named.conf.in
index e25ec3dc45c..83acfe35b8f 100644
--- a/bin/tests/system/rpz/ns7/named.conf.in
+++ b/bin/tests/system/rpz/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index f264e05024d..3aa4d125544 100644
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2011-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/test1 b/bin/tests/system/rpz/test1
index 5f3d91165db..462d69bba53 100644
--- a/bin/tests/system/rpz/test1
+++ b/bin/tests/system/rpz/test1
@@ -1,4 +1,4 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/test2 b/bin/tests/system/rpz/test2
index 56fcdf263f8..b92b22630db 100644
--- a/bin/tests/system/rpz/test2
+++ b/bin/tests/system/rpz/test2
@@ -1,4 +1,4 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/test3 b/bin/tests/system/rpz/test3
index f1ca8e20a0d..5108a2c86c2 100644
--- a/bin/tests/system/rpz/test3
+++ b/bin/tests/system/rpz/test3
@@ -1,4 +1,4 @@
-; Copyright (C) 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/test4 b/bin/tests/system/rpz/test4
index bdf3d06d0c4..922afa98ee9 100644
--- a/bin/tests/system/rpz/test4
+++ b/bin/tests/system/rpz/test4
@@ -1,4 +1,4 @@
-; Copyright (C) 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/test4a b/bin/tests/system/rpz/test4a
index afb26e28789..6c9c28f693d 100644
--- a/bin/tests/system/rpz/test4a
+++ b/bin/tests/system/rpz/test4a
@@ -1,4 +1,4 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/test5 b/bin/tests/system/rpz/test5
index 97d185da551..df60cf4908c 100644
--- a/bin/tests/system/rpz/test5
+++ b/bin/tests/system/rpz/test5
@@ -1,4 +1,4 @@
-; Copyright (C) 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/test6 b/bin/tests/system/rpz/test6
index 46c6bd91056..72072c0e277 100644
--- a/bin/tests/system/rpz/test6
+++ b/bin/tests/system/rpz/test6
@@ -1,4 +1,4 @@
-; Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+; Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 43d85321583..35b717cbb1d 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpzrecurse/ans5/ans.pl b/bin/tests/system/rpzrecurse/ans5/ans.pl
index 60cf0840899..a0d86525328 100644
--- a/bin/tests/system/rpzrecurse/ans5/ans.pl
+++ b/bin/tests/system/rpzrecurse/ans5/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
index ec60cb540fe..afb102fe9da 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
+++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.in b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
index 5572ddbd88e..01001f4a72b 100644
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.in b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
index 5fb8f010f7a..604c84e33e7 100644
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.in b/bin/tests/system/rpzrecurse/ns4/named.conf.in
index 0473d5c2039..ca1f303f5f4 100644
--- a/bin/tests/system/rpzrecurse/ns4/named.conf.in
+++ b/bin/tests/system/rpzrecurse/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh
index 8ae04065390..f647072a52d 100644
--- a/bin/tests/system/rrchecker/tests.sh
+++ b/bin/tests/system/rrchecker/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrl/clean.sh b/bin/tests/system/rrl/clean.sh
index ddaa461a484..cde5d460fc3 100644
--- a/bin/tests/system/rrl/clean.sh
+++ b/bin/tests/system/rrl/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrl/ns1/named.conf.in b/bin/tests/system/rrl/ns1/named.conf.in
index c644058ce6a..38da14b8c0e 100644
--- a/bin/tests/system/rrl/ns1/named.conf.in
+++ b/bin/tests/system/rrl/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.in
index cfcd09687dd..0632a6c2931 100644
--- a/bin/tests/system/rrl/ns2/named.conf.in
+++ b/bin/tests/system/rrl/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrl/ns3/named.conf.in b/bin/tests/system/rrl/ns3/named.conf.in
index 85e368af5d1..1fc7adde03e 100644
--- a/bin/tests/system/rrl/ns3/named.conf.in
+++ b/bin/tests/system/rrl/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrl/ns4/named.conf.in b/bin/tests/system/rrl/ns4/named.conf.in
index ea0992b8fa0..272f46b0d3f 100644
--- a/bin/tests/system/rrl/ns4/named.conf.in
+++ b/bin/tests/system/rrl/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh
index 20211579f2c..5070de109e1 100644
--- a/bin/tests/system/rrl/setup.sh
+++ b/bin/tests/system/rrl/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index e76d8011ab4..26e7a758d29 100644
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012, 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh
index 069fcbcb879..3392589257c 100644
--- a/bin/tests/system/rrsetorder/clean.sh
+++ b/bin/tests/system/rrsetorder/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2006-2008, 2011, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.in b/bin/tests/system/rrsetorder/ns1/named.conf.in
index cbc210c360a..906062e2728 100644
--- a/bin/tests/system/rrsetorder/ns1/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.in b/bin/tests/system/rrsetorder/ns2/named.conf.in
index 19aca3f730b..cbcfecd7389 100644
--- a/bin/tests/system/rrsetorder/ns2/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.in b/bin/tests/system/rrsetorder/ns3/named.conf.in
index 5506caa43fe..6bbe0bae47b 100644
--- a/bin/tests/system/rrsetorder/ns3/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2006, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.in b/bin/tests/system/rrsetorder/ns4/named.conf.in
index 297e954268d..b4fb7d78be4 100644
--- a/bin/tests/system/rrsetorder/ns4/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrsetorder/setup.sh b/bin/tests/system/rrsetorder/setup.sh
index a3303c31178..7d0bc272e02 100644
--- a/bin/tests/system/rrsetorder/setup.sh
+++ b/bin/tests/system/rrsetorder/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index 361ef8574d2..c2fb74fad3a 100644
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2006-2008, 2011, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2006-2008, 2011, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rsabigexponent/clean.sh b/bin/tests/system/rsabigexponent/clean.sh
index 4c0418dac95..9b8dca6a152 100644
--- a/bin/tests/system/rsabigexponent/clean.sh
+++ b/bin/tests/system/rsabigexponent/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rsabigexponent/ns1/named.conf.in b/bin/tests/system/rsabigexponent/ns1/named.conf.in
index 25f88fd0ccf..ba529b6ef31 100644
--- a/bin/tests/system/rsabigexponent/ns1/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rsabigexponent/ns2/named.conf.in b/bin/tests/system/rsabigexponent/ns2/named.conf.in
index 8dadb7ee226..7e7ce51ec45 100644
--- a/bin/tests/system/rsabigexponent/ns2/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rsabigexponent/ns3/named.conf.in b/bin/tests/system/rsabigexponent/ns3/named.conf.in
index 2b24883541a..5ce0908b08f 100644
--- a/bin/tests/system/rsabigexponent/ns3/named.conf.in
+++ b/bin/tests/system/rsabigexponent/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rsabigexponent/prereq.sh b/bin/tests/system/rsabigexponent/prereq.sh
index b93cb210744..78530afc871 100644
--- a/bin/tests/system/rsabigexponent/prereq.sh
+++ b/bin/tests/system/rsabigexponent/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index 75688ee8836..850d030a5e1 100644
--- a/bin/tests/system/rsabigexponent/setup.sh
+++ b/bin/tests/system/rsabigexponent/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/rsabigexponent/tests.sh b/bin/tests/system/rsabigexponent/tests.sh
index 1bb0e973e64..9f1a04c219e 100644
--- a/bin/tests/system/rsabigexponent/tests.sh
+++ b/bin/tests/system/rsabigexponent/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 7379fdc7468..c458dee1ef9 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2010, 2012, 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2010, 2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index ad2a825c2e9..89fc2ce60ac 100644
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2010-2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2010-2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runsequential.sh b/bin/tests/system/runsequential.sh
index d590764c357..39022abb970 100644
--- a/bin/tests/system/runsequential.sh
+++ b/bin/tests/system/runsequential.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2010-2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/clean.sh b/bin/tests/system/runtime/clean.sh
index c141923f67c..e57e5615858 100644
--- a/bin/tests/system/runtime/clean.sh
+++ b/bin/tests/system/runtime/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/ns2/named-alt1.conf.in b/bin/tests/system/runtime/ns2/named-alt1.conf.in
index e3b1fcd08dd..39c393840fb 100644
--- a/bin/tests/system/runtime/ns2/named-alt1.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/ns2/named-alt2.conf.in b/bin/tests/system/runtime/ns2/named-alt2.conf.in
index 1329de4f4ed..b2f5a7ad776 100644
--- a/bin/tests/system/runtime/ns2/named-alt2.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/ns2/named-alt3.conf.in b/bin/tests/system/runtime/ns2/named-alt3.conf.in
index 976f531f10a..0cce827e53b 100644
--- a/bin/tests/system/runtime/ns2/named-alt3.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt3.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/ns2/named-alt4.conf.in b/bin/tests/system/runtime/ns2/named-alt4.conf.in
index a52f2aee7b8..de04a3ccbc6 100644
--- a/bin/tests/system/runtime/ns2/named-alt4.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt4.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/ns2/named-alt5.conf.in b/bin/tests/system/runtime/ns2/named-alt5.conf.in
index 18412b93070..a586aa21170 100644
--- a/bin/tests/system/runtime/ns2/named-alt5.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt5.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/ns2/named-alt6.conf.in b/bin/tests/system/runtime/ns2/named-alt6.conf.in
index 2bb26345f9a..94510c44bb0 100644
--- a/bin/tests/system/runtime/ns2/named-alt6.conf.in
+++ b/bin/tests/system/runtime/ns2/named-alt6.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/ns2/named1.conf.in b/bin/tests/system/runtime/ns2/named1.conf.in
index a882f9bac4f..fe19ec8f7cc 100644
--- a/bin/tests/system/runtime/ns2/named1.conf.in
+++ b/bin/tests/system/runtime/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/setup.sh b/bin/tests/system/runtime/setup.sh
index fc301c8f92d..be1d3191acb 100644
--- a/bin/tests/system/runtime/setup.sh
+++ b/bin/tests/system/runtime/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 30f8de2b5f8..9e73bbba7a1 100644
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/serve-stale/ans2/ans.pl b/bin/tests/system/serve-stale/ans2/ans.pl
index 2992fb8dab9..2a037b2db8f 100644
--- a/bin/tests/system/serve-stale/ans2/ans.pl
+++ b/bin/tests/system/serve-stale/ans2/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/serve-stale/clean.sh b/bin/tests/system/serve-stale/clean.sh
index 9ba52f1709e..5a38df583c5 100644
--- a/bin/tests/system/serve-stale/clean.sh
+++ b/bin/tests/system/serve-stale/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/serve-stale/ns1/named1.conf.in b/bin/tests/system/serve-stale/ns1/named1.conf.in
index 9b9004ec3c8..153a603864f 100644
--- a/bin/tests/system/serve-stale/ns1/named1.conf.in
+++ b/bin/tests/system/serve-stale/ns1/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/serve-stale/ns1/named2.conf.in b/bin/tests/system/serve-stale/ns1/named2.conf.in
index d6945d56d0c..479178151f3 100644
--- a/bin/tests/system/serve-stale/ns1/named2.conf.in
+++ b/bin/tests/system/serve-stale/ns1/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/serve-stale/ns3/named.conf.in b/bin/tests/system/serve-stale/ns3/named.conf.in
index c4a1893e533..34b5ad2d044 100644
--- a/bin/tests/system/serve-stale/ns3/named.conf.in
+++ b/bin/tests/system/serve-stale/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh
index 1eb5b0bfcb3..92ee3ce1ac3 100644
--- a/bin/tests/system/serve-stale/setup.sh
+++ b/bin/tests/system/serve-stale/setup.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+#
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh
index 999ad25904f..57b5a7c2d91 100755
--- a/bin/tests/system/serve-stale/tests.sh
+++ b/bin/tests/system/serve-stale/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sfcache/ns1/named.conf.in b/bin/tests/system/sfcache/ns1/named.conf.in
index 6cf080e37f8..314091631df 100644
--- a/bin/tests/system/sfcache/ns1/named.conf.in
+++ b/bin/tests/system/sfcache/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sfcache/ns2/named.conf.in b/bin/tests/system/sfcache/ns2/named.conf.in
index 93d25aab696..0e94f026a66 100644
--- a/bin/tests/system/sfcache/ns2/named.conf.in
+++ b/bin/tests/system/sfcache/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sfcache/ns5/named.conf.in b/bin/tests/system/sfcache/ns5/named.conf.in
index 4e8a15bdaff..370c0ea864e 100644
--- a/bin/tests/system/sfcache/ns5/named.conf.in
+++ b/bin/tests/system/sfcache/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh
index 7e1cb1ee083..98babf0283b 100644
--- a/bin/tests/system/sfcache/setup.sh
+++ b/bin/tests/system/sfcache/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh
index f5dd39b0bc3..4333a1a42cb 100644
--- a/bin/tests/system/smartsign/tests.sh
+++ b/bin/tests/system/smartsign/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh
index 9d060fa53e1..4afaba51e2e 100644
--- a/bin/tests/system/sortlist/clean.sh
+++ b/bin/tests/system/sortlist/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2009, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sortlist/ns1/named.conf.in b/bin/tests/system/sortlist/ns1/named.conf.in
index ba0710eed79..5188c787a03 100644
--- a/bin/tests/system/sortlist/ns1/named.conf.in
+++ b/bin/tests/system/sortlist/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sortlist/setup.sh b/bin/tests/system/sortlist/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/sortlist/setup.sh
+++ b/bin/tests/system/sortlist/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh
index 00ecfdb598b..4018df735a5 100644
--- a/bin/tests/system/sortlist/tests.sh
+++ b/bin/tests/system/sortlist/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/spf/clean.sh b/bin/tests/system/spf/clean.sh
index 98fc06997fb..5a592c6e299 100644
--- a/bin/tests/system/spf/clean.sh
+++ b/bin/tests/system/spf/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/spf/ns1/named.conf.in b/bin/tests/system/spf/ns1/named.conf.in
index 11f96792735..a66eed7131d 100644
--- a/bin/tests/system/spf/ns1/named.conf.in
+++ b/bin/tests/system/spf/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/spf/setup.sh b/bin/tests/system/spf/setup.sh
index c69f051dbc3..26bc0d83310 100644
--- a/bin/tests/system/spf/setup.sh
+++ b/bin/tests/system/spf/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/spf/tests.sh b/bin/tests/system/spf/tests.sh
index 01e9d20ef8a..341f06c6bfb 100644
--- a/bin/tests/system/spf/tests.sh
+++ b/bin/tests/system/spf/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index 542ad1ce78c..b04b7e3a8e8 100755
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2001, 2004-2008, 2010-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004-2008, 2010-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/staticstub/clean.sh b/bin/tests/system/staticstub/clean.sh
index 2cb1cf0b387..5b6f640af46 100755
--- a/bin/tests/system/staticstub/clean.sh
+++ b/bin/tests/system/staticstub/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/staticstub/ns1/named.conf.in b/bin/tests/system/staticstub/ns1/named.conf.in
index 52a32b43953..290cfea3340 100644
--- a/bin/tests/system/staticstub/ns1/named.conf.in
+++ b/bin/tests/system/staticstub/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/staticstub/ns2/named.conf.in b/bin/tests/system/staticstub/ns2/named.conf.in
index fc45b5cc987..21155b125bc 100644
--- a/bin/tests/system/staticstub/ns2/named.conf.in
+++ b/bin/tests/system/staticstub/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in
index 7b4dbc9fd44..8844f8ee574 100644
--- a/bin/tests/system/staticstub/ns3/named.conf.in
+++ b/bin/tests/system/staticstub/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/staticstub/ns4/named.conf.in b/bin/tests/system/staticstub/ns4/named.conf.in
index df97b25ade8..363a7d09283 100644
--- a/bin/tests/system/staticstub/ns4/named.conf.in
+++ b/bin/tests/system/staticstub/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index ee899926057..f03a76f50e2 100755
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index 7e2c0ca00e2..2114a4bb9b9 100755
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/ans4/ans.pl b/bin/tests/system/statistics/ans4/ans.pl
index a6b2e92b3ab..56e80332bd1 100644
--- a/bin/tests/system/statistics/ans4/ans.pl
+++ b/bin/tests/system/statistics/ans4/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/clean.sh b/bin/tests/system/statistics/clean.sh
index bda1a0809b4..096c3cc8c8e 100644
--- a/bin/tests/system/statistics/clean.sh
+++ b/bin/tests/system/statistics/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/ns1/named.conf.in b/bin/tests/system/statistics/ns1/named.conf.in
index 43edaf5cb80..6806d92a209 100644
--- a/bin/tests/system/statistics/ns1/named.conf.in
+++ b/bin/tests/system/statistics/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/ns2/named.conf.in b/bin/tests/system/statistics/ns2/named.conf.in
index c9bfe52baa8..1be9209fd6f 100644
--- a/bin/tests/system/statistics/ns2/named.conf.in
+++ b/bin/tests/system/statistics/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/ns3/named.conf.in b/bin/tests/system/statistics/ns3/named.conf.in
index 8fda6a227c6..f3901194cec 100644
--- a/bin/tests/system/statistics/ns3/named.conf.in
+++ b/bin/tests/system/statistics/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/prereq.sh b/bin/tests/system/statistics/prereq.sh
index d621132d8bc..7c3dacb567b 100644
--- a/bin/tests/system/statistics/prereq.sh
+++ b/bin/tests/system/statistics/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/setup.sh b/bin/tests/system/statistics/setup.sh
index e877403d82d..08a9c49e8ca 100644
--- a/bin/tests/system/statistics/setup.sh
+++ b/bin/tests/system/statistics/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh
index 89453a99e43..2b063e259a6 100644
--- a/bin/tests/system/statistics/tests.sh
+++ b/bin/tests/system/statistics/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statschannel/clean.sh b/bin/tests/system/statschannel/clean.sh
index ae34df0688a..c6d0c008b2f 100644
--- a/bin/tests/system/statschannel/clean.sh
+++ b/bin/tests/system/statschannel/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statschannel/ns2/named.conf.in b/bin/tests/system/statschannel/ns2/named.conf.in
index 8cad8316827..b581db97ee3 100644
--- a/bin/tests/system/statschannel/ns2/named.conf.in
+++ b/bin/tests/system/statschannel/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statschannel/prereq.sh b/bin/tests/system/statschannel/prereq.sh
index cc676f7f5f3..b8c27c2d10c 100644
--- a/bin/tests/system/statschannel/prereq.sh
+++ b/bin/tests/system/statschannel/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statschannel/setup.sh b/bin/tests/system/statschannel/setup.sh
index 6942b2ca805..9b759ab0b32 100644
--- a/bin/tests/system/statschannel/setup.sh
+++ b/bin/tests/system/statschannel/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh
index 459d7c2ea8d..499c317dfd4 100644
--- a/bin/tests/system/statschannel/tests.sh
+++ b/bin/tests/system/statschannel/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2015-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index fbf382bcd4b..1be327092ef 100644
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -1,13 +1,11 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2001, 2004-2007, 2012, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2004-2007, 2012, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# $Id: stop.pl,v 1.12 2007/06/19 23:47:00 tbox Exp $
-
 # Framework for stopping test servers
 # Based on the type of server specified, signal the server to stop, wait
 # briefly for it to die, and then kill it if it is still alive.
diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh
index d4f800f969b..2bbf3f5ef10 100644
--- a/bin/tests/system/stub/clean.sh
+++ b/bin/tests/system/stub/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/stub/ns1/named.conf.in b/bin/tests/system/stub/ns1/named.conf.in
index 23b0c22af5b..5b363723386 100644
--- a/bin/tests/system/stub/ns1/named.conf.in
+++ b/bin/tests/system/stub/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/stub/ns2/named.conf.in b/bin/tests/system/stub/ns2/named.conf.in
index 36b8c578a39..9f58aa376be 100644
--- a/bin/tests/system/stub/ns2/named.conf.in
+++ b/bin/tests/system/stub/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/stub/ns3/named.conf.in b/bin/tests/system/stub/ns3/named.conf.in
index d6300e29793..e97c9ecad2e 100644
--- a/bin/tests/system/stub/ns3/named.conf.in
+++ b/bin/tests/system/stub/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/stub/setup.sh b/bin/tests/system/stub/setup.sh
index 5a1b70fb72e..0ad5ea679bb 100644
--- a/bin/tests/system/stub/setup.sh
+++ b/bin/tests/system/stub/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index a2c838e83fa..e95408388e1 100644
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/clean.sh b/bin/tests/system/synthfromdnssec/clean.sh
index dcfc4615ba2..7be2b7fd164 100644
--- a/bin/tests/system/synthfromdnssec/clean.sh
+++ b/bin/tests/system/synthfromdnssec/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/ns1/named.conf.in b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
index 3df43654e4a..6649f0fb097 100644
--- a/bin/tests/system/synthfromdnssec/ns1/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/ns2/named.conf.in b/bin/tests/system/synthfromdnssec/ns2/named.conf.in
index fe115d5f121..91ed5f50c8d 100644
--- a/bin/tests/system/synthfromdnssec/ns2/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/ns3/named.conf.in b/bin/tests/system/synthfromdnssec/ns3/named.conf.in
index 364c9677af6..80d8f701bdd 100644
--- a/bin/tests/system/synthfromdnssec/ns3/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/ns4/named.conf.in b/bin/tests/system/synthfromdnssec/ns4/named.conf.in
index 5c65c96d8f8..38aef729764 100644
--- a/bin/tests/system/synthfromdnssec/ns4/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/ns5/named.conf.in b/bin/tests/system/synthfromdnssec/ns5/named.conf.in
index 7c32aa7a3e9..691c1f549c0 100644
--- a/bin/tests/system/synthfromdnssec/ns5/named.conf.in
+++ b/bin/tests/system/synthfromdnssec/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/setup.sh b/bin/tests/system/synthfromdnssec/setup.sh
index d22413cbadd..c93f3948ef2 100644
--- a/bin/tests/system/synthfromdnssec/setup.sh
+++ b/bin/tests/system/synthfromdnssec/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/synthfromdnssec/tests.sh b/bin/tests/system/synthfromdnssec/tests.sh
index 4b7c066cfed..31084dc6f4d 100644
--- a/bin/tests/system/synthfromdnssec/tests.sh
+++ b/bin/tests/system/synthfromdnssec/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tcp/clean.sh b/bin/tests/system/tcp/clean.sh
index 7744782b12c..52151acaa5f 100644
--- a/bin/tests/system/tcp/clean.sh
+++ b/bin/tests/system/tcp/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tcp/ns1/named.conf.in b/bin/tests/system/tcp/ns1/named.conf.in
index 8775f1c6e09..ca654e8806d 100644
--- a/bin/tests/system/tcp/ns1/named.conf.in
+++ b/bin/tests/system/tcp/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tcp/ns2/named.conf.in b/bin/tests/system/tcp/ns2/named.conf.in
index b59241d7084..b6b1c6348be 100644
--- a/bin/tests/system/tcp/ns2/named.conf.in
+++ b/bin/tests/system/tcp/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tcp/ns3/named.conf.in b/bin/tests/system/tcp/ns3/named.conf.in
index 18f5cf883a0..764f759670e 100644
--- a/bin/tests/system/tcp/ns3/named.conf.in
+++ b/bin/tests/system/tcp/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tcp/ns4/named.conf.in b/bin/tests/system/tcp/ns4/named.conf.in
index 2400638225d..b810eca4f1c 100644
--- a/bin/tests/system/tcp/ns4/named.conf.in
+++ b/bin/tests/system/tcp/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tcp/setup.sh b/bin/tests/system/tcp/setup.sh
index 0088e79099a..5c3440e70bd 100644
--- a/bin/tests/system/tcp/setup.sh
+++ b/bin/tests/system/tcp/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C)  2018  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh
index 8c27c323cce..09e18244243 100644
--- a/bin/tests/system/tcp/tests.sh
+++ b/bin/tests/system/tcp/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index cea0cc4a72b..3615ee3d405 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2010-2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tools/tests.sh b/bin/tests/system/tools/tests.sh
index 6c1f77c45f7..303aef46a71 100644
--- a/bin/tests/system/tools/tests.sh
+++ b/bin/tests/system/tools/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsig/ns1/named.conf.in b/bin/tests/system/tsig/ns1/named.conf.in
index 12095e541d1..8d61a31a094 100644
--- a/bin/tests/system/tsig/ns1/named.conf.in
+++ b/bin/tests/system/tsig/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2005-2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh
index 160e3d941fb..bb36429ee0a 100644
--- a/bin/tests/system/tsig/setup.sh
+++ b/bin/tests/system/tsig/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsiggss/authsock.pl b/bin/tests/system/tsiggss/authsock.pl
index 75ed972ab56..88140fe0f54 100644
--- a/bin/tests/system/tsiggss/authsock.pl
+++ b/bin/tests/system/tsiggss/authsock.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsiggss/clean.sh b/bin/tests/system/tsiggss/clean.sh
index bca6e4b0343..5f7684d6300 100644
--- a/bin/tests/system/tsiggss/clean.sh
+++ b/bin/tests/system/tsiggss/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2011, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsiggss/ns1/named.conf.in b/bin/tests/system/tsiggss/ns1/named.conf.in
index bc554cee5c7..c313a711785 100644
--- a/bin/tests/system/tsiggss/ns1/named.conf.in
+++ b/bin/tests/system/tsiggss/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2010, 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsiggss/prereq.sh b/bin/tests/system/tsiggss/prereq.sh
index 3a1a4b13d20..34c3bc9c671 100644
--- a/bin/tests/system/tsiggss/prereq.sh
+++ b/bin/tests/system/tsiggss/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
index d53a8610a4d..c6b0b6a0cff 100644
--- a/bin/tests/system/tsiggss/setup.sh
+++ b/bin/tests/system/tsiggss/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010-2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010-2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh
index 5c84b3496e9..a4aa7cd9138 100644
--- a/bin/tests/system/tsiggss/tests.sh
+++ b/bin/tests/system/tsiggss/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010, 2011, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2010, 2011, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh
index d452409b28e..b72be418c68 100644
--- a/bin/tests/system/unknown/clean.sh
+++ b/bin/tests/system/unknown/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/unknown/ns1/named.conf.in b/bin/tests/system/unknown/ns1/named.conf.in
index e1e7901b4e8..1729878ecfe 100644
--- a/bin/tests/system/unknown/ns1/named.conf.in
+++ b/bin/tests/system/unknown/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/unknown/ns2/named.conf.in b/bin/tests/system/unknown/ns2/named.conf.in
index ae41808fb08..8c069759809 100644
--- a/bin/tests/system/unknown/ns2/named.conf.in
+++ b/bin/tests/system/unknown/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/unknown/ns3/named.conf.in b/bin/tests/system/unknown/ns3/named.conf.in
index c75d16d299b..a0ee08ae936 100644
--- a/bin/tests/system/unknown/ns3/named.conf.in
+++ b/bin/tests/system/unknown/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index 1a2f04b66d8..b9a4bf11a15 100644
--- a/bin/tests/system/unknown/setup.sh
+++ b/bin/tests/system/unknown/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index e1bb9ee09b2..eae0f4a8442 100644
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011-2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/ans4/ans.pl b/bin/tests/system/upforwd/ans4/ans.pl
index 2f4d12e28ef..0a99d070276 100644
--- a/bin/tests/system/upforwd/ans4/ans.pl
+++ b/bin/tests/system/upforwd/ans4/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright (C) 2011, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index 7f6560c3361..aa37c06e7a0 100644
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in
index 9322bc76a04..e5fcd351339 100644
--- a/bin/tests/system/upforwd/ns1/named.conf.in
+++ b/bin/tests/system/upforwd/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/ns2/named.conf.in b/bin/tests/system/upforwd/ns2/named.conf.in
index 5cf42c78ce1..5b76142b16b 100644
--- a/bin/tests/system/upforwd/ns2/named.conf.in
+++ b/bin/tests/system/upforwd/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/ns3/named.conf.in b/bin/tests/system/upforwd/ns3/named.conf.in
index 2dcba8326ec..6ef38248ead 100644
--- a/bin/tests/system/upforwd/ns3/named.conf.in
+++ b/bin/tests/system/upforwd/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/prereq.sh b/bin/tests/system/upforwd/prereq.sh
index fad66b0fb4f..d0d27a8b096 100644
--- a/bin/tests/system/upforwd/prereq.sh
+++ b/bin/tests/system/upforwd/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index 31cab0a7c9a..c33ebceffae 100644
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index 8748eddd86a..e112f913e9f 100644
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/verify/tests.sh b/bin/tests/system/verify/tests.sh
index f42b415689a..a677ba88a50 100644
--- a/bin/tests/system/verify/tests.sh
+++ b/bin/tests/system/verify/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh
index 0c05714276e..5c8cd16ce27 100644
--- a/bin/tests/system/verify/zones/genzones.sh
+++ b/bin/tests/system/verify/zones/genzones.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index 4a04921fa7d..5af2a3e5cc0 100644
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2005, 2007, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2005, 2007, 2012-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/ns1/named.conf.in b/bin/tests/system/views/ns1/named.conf.in
index 262fbe93d78..b098ff58af5 100644
--- a/bin/tests/system/views/ns1/named.conf.in
+++ b/bin/tests/system/views/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index d02c762d87d..3c80e5513bf 100644
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in
index 7dbd132c22a..e79ee0a5628 100644
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in
index 5f29876bfa9..0e6d60aea3c 100644
--- a/bin/tests/system/views/ns3/named1.conf.in
+++ b/bin/tests/system/views/ns3/named1.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in
index 8a16e048dce..7904fc6f2f2 100644
--- a/bin/tests/system/views/ns3/named2.conf.in
+++ b/bin/tests/system/views/ns3/named2.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/ns5/named.conf.in b/bin/tests/system/views/ns5/named.conf.in
index f16eb695efd..006ec33a2eb 100644
--- a/bin/tests/system/views/ns5/named.conf.in
+++ b/bin/tests/system/views/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index 4dca90a31c6..13fdc86a9e2 100644
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 47f04d712ee..4ab29cd5caf 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/clean.sh b/bin/tests/system/wildcard/clean.sh
index d16bc49dedc..5a3329f29e5 100644
--- a/bin/tests/system/wildcard/clean.sh
+++ b/bin/tests/system/wildcard/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/ns1/named.conf.in b/bin/tests/system/wildcard/ns1/named.conf.in
index 3cc039ec3af..c7d5b3fd442 100644
--- a/bin/tests/system/wildcard/ns1/named.conf.in
+++ b/bin/tests/system/wildcard/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh
index 39697ba936e..819845df6af 100755
--- a/bin/tests/system/wildcard/ns1/sign.sh
+++ b/bin/tests/system/wildcard/ns1/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/ns2/named.conf.in b/bin/tests/system/wildcard/ns2/named.conf.in
index 098dcd49137..3eb3b186f01 100644
--- a/bin/tests/system/wildcard/ns2/named.conf.in
+++ b/bin/tests/system/wildcard/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/ns3/named.conf.in b/bin/tests/system/wildcard/ns3/named.conf.in
index 61de7f2b7b7..62d3f2a5375 100644
--- a/bin/tests/system/wildcard/ns3/named.conf.in
+++ b/bin/tests/system/wildcard/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/ns4/named.conf.in b/bin/tests/system/wildcard/ns4/named.conf.in
index ee5b74688bc..ae0d4834c44 100644
--- a/bin/tests/system/wildcard/ns4/named.conf.in
+++ b/bin/tests/system/wildcard/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/ns5/named.conf.in b/bin/tests/system/wildcard/ns5/named.conf.in
index 5396ca903d8..e53d00cef0d 100644
--- a/bin/tests/system/wildcard/ns5/named.conf.in
+++ b/bin/tests/system/wildcard/ns5/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index 02d72e77da9..2d25a357d79 100644
--- a/bin/tests/system/wildcard/setup.sh
+++ b/bin/tests/system/wildcard/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/wildcard/tests.sh b/bin/tests/system/wildcard/tests.sh
index 08934560bf0..56d730f42ec 100644
--- a/bin/tests/system/wildcard/tests.sh
+++ b/bin/tests/system/wildcard/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index 5adf658db17..5f60be024e7 100644
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/ns1/named.conf.in b/bin/tests/system/xfer/ns1/named.conf.in
index 51a08064570..2f59a44bbf5 100644
--- a/bin/tests/system/xfer/ns1/named.conf.in
+++ b/bin/tests/system/xfer/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.in
index 3a3ffdd3943..c0e1db40ae8 100644
--- a/bin/tests/system/xfer/ns2/named.conf.in
+++ b/bin/tests/system/xfer/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.in
index 3b734810639..e9677816f1d 100644
--- a/bin/tests/system/xfer/ns3/named.conf.in
+++ b/bin/tests/system/xfer/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2011, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/ns4/named.conf.base b/bin/tests/system/xfer/ns4/named.conf.base
index bbb9af4e2f3..4bc5e3f0b23 100644
--- a/bin/tests/system/xfer/ns4/named.conf.base
+++ b/bin/tests/system/xfer/ns4/named.conf.base
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2013, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/ns6/named.conf.in b/bin/tests/system/xfer/ns6/named.conf.in
index 5ee08275cd6..9b62caf0dfb 100644
--- a/bin/tests/system/xfer/ns6/named.conf.in
+++ b/bin/tests/system/xfer/ns6/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/ns7/named.conf.in b/bin/tests/system/xfer/ns7/named.conf.in
index 9f3bbbd96cf..4549065dd13 100644
--- a/bin/tests/system/xfer/ns7/named.conf.in
+++ b/bin/tests/system/xfer/ns7/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/ns8/named.conf.in b/bin/tests/system/xfer/ns8/named.conf.in
index 1b34706c706..0984e0a26f9 100644
--- a/bin/tests/system/xfer/ns8/named.conf.in
+++ b/bin/tests/system/xfer/ns8/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/prereq.sh b/bin/tests/system/xfer/prereq.sh
index f180da62a16..c208894b086 100644
--- a/bin/tests/system/xfer/prereq.sh
+++ b/bin/tests/system/xfer/prereq.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011, 2012, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index dc6c56b11e9..e886d578d2b 100644
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2001, 2002, 2004, 2007, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001, 2002, 2004, 2007, 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index ab73b702397..257c4d4236b 100755
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2005, 2007, 2011-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2005, 2007, 2011-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index 8a14de95348..a608e7a1517 100644
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xferquota/ns1/named.conf.in b/bin/tests/system/xferquota/ns1/named.conf.in
index f2fdbb28616..2562c552a3a 100644
--- a/bin/tests/system/xferquota/ns1/named.conf.in
+++ b/bin/tests/system/xferquota/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xferquota/ns2/named.conf.in b/bin/tests/system/xferquota/ns2/named.conf.in
index b6328eb8101..c10e83b9c57 100644
--- a/bin/tests/system/xferquota/ns2/named.conf.in
+++ b/bin/tests/system/xferquota/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2007, 2016  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2000, 2001, 2004, 2007, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index c9dbd91c761..70328d53ad6 100644
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index f1ec0cb2b4f..076410c87fc 100755
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2000, 2001, 2004, 2007, 2012, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/ans5/ans.pl b/bin/tests/system/zero/ans5/ans.pl
index a5ce18f46b6..45e44731bd8 100644
--- a/bin/tests/system/zero/ans5/ans.pl
+++ b/bin/tests/system/zero/ans5/ans.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/clean.sh b/bin/tests/system/zero/clean.sh
index edc02ab2c98..6dfc3c30708 100644
--- a/bin/tests/system/zero/clean.sh
+++ b/bin/tests/system/zero/clean.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/ns1/named.conf.in b/bin/tests/system/zero/ns1/named.conf.in
index 3b6e72afacd..5d01ab306ec 100644
--- a/bin/tests/system/zero/ns1/named.conf.in
+++ b/bin/tests/system/zero/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/ns2/named.conf.in b/bin/tests/system/zero/ns2/named.conf.in
index 9b4c09d92f1..032592021fe 100644
--- a/bin/tests/system/zero/ns2/named.conf.in
+++ b/bin/tests/system/zero/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/ns3/named.conf.in b/bin/tests/system/zero/ns3/named.conf.in
index 538e6675ff8..5f2184a9d77 100644
--- a/bin/tests/system/zero/ns3/named.conf.in
+++ b/bin/tests/system/zero/ns3/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/ns4/named.conf.in b/bin/tests/system/zero/ns4/named.conf.in
index 8bf19175003..1abd8bc715c 100644
--- a/bin/tests/system/zero/ns4/named.conf.in
+++ b/bin/tests/system/zero/ns4/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/setup.sh b/bin/tests/system/zero/setup.sh
index ce82f3641b5..830d98d392b 100644
--- a/bin/tests/system/zero/setup.sh
+++ b/bin/tests/system/zero/setup.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2014, 2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2014, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh
index 3e6cda55456..a2610bb81c7 100644
--- a/bin/tests/system/zero/tests.sh
+++ b/bin/tests/system/zero/tests.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh
index fee0edecde0..4c383546a04 100644
--- a/bin/tests/system/zonechecks/clean.sh
+++ b/bin/tests/system/zonechecks/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2012, 2014-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2012, 2014-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in
index 8ff627dad4b..5e1eff0085b 100644
--- a/bin/tests/system/zonechecks/ns1/named.conf.in
+++ b/bin/tests/system/zonechecks/ns1/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zonechecks/ns2/named.conf.in b/bin/tests/system/zonechecks/ns2/named.conf.in
index fe2cc453717..50d88289778 100644
--- a/bin/tests/system/zonechecks/ns2/named.conf.in
+++ b/bin/tests/system/zonechecks/ns2/named.conf.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2012, 2013, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index bef8895d4c6..17c1d77a297 100644
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2012-2017  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh
index 055bb6f6b89..093831bba80 100644
--- a/bin/tests/system/zonechecks/tests.sh
+++ b/bin/tests/system/zonechecks/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007, 2009, 2012-2016  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2009, 2012-2016, 2018  Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/util/copyrights b/util/copyrights
index 2f7b39bc168..5ed85f51ea5 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -11,8 +11,8 @@
 ./Makefile.in					MAKE	1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2011,2012,2013,2014,2015,2016,2017
 ./OPTIONS					X	2017
 ./OPTIONS.md					MKD	2017
-./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./README.md					MKD	2017
+./README					X	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./README.md					MKD	2017,2018
 ./acconfig.h					C	1999,2000,2001,2002,2003,2004,2005,2007,2008,2012,2014,2016
 ./aclocal.m4					X	1999,2000,2001,2012,2014
 ./autogen.sh					SH	2015,2016
@@ -614,44 +614,44 @@
 ./bin/tests/startperf/setup.sh			SH	2011,2012,2016
 ./bin/tests/startperf/smallzone.db		ZONE	2011,2016
 ./bin/tests/sym_test.c				C	1998,1999,2000,2001,2004,2005,2007,2015,2016
-./bin/tests/system/.gitignore			X	2012,2016
-./bin/tests/system/Makefile.in			MAKE	2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/README			TXT.BRIEF	2000,2001,2004,2010,2011,2013,2015,2016,2017
-./bin/tests/system/acl/clean.sh			SH	2008,2012,2014,2015,2016,2017
-./bin/tests/system/acl/ns2/named1.conf		CONF-C	2008,2016
-./bin/tests/system/acl/ns2/named2.conf		CONF-C	2008,2016
-./bin/tests/system/acl/ns2/named3.conf		CONF-C	2008,2016
-./bin/tests/system/acl/ns2/named4.conf		CONF-C	2008,2016
-./bin/tests/system/acl/ns2/named5.conf		CONF-C	2013,2016
-./bin/tests/system/acl/ns2/named6.conf		CONF-C	2014,2016
-./bin/tests/system/acl/ns2/named7.conf		CONF-C	2014,2016
+./bin/tests/system/.gitignore			X	2012,2016,2018
+./bin/tests/system/Makefile.in			MAKE	2000,2001,2004,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/README			TXT.BRIEF	2000,2001,2004,2010,2011,2013,2015,2016,2017,2018
+./bin/tests/system/acl/clean.sh			SH	2008,2012,2014,2015,2016,2017,2018
+./bin/tests/system/acl/ns2/named1.conf.in	CONF-C	2008,2016,2018
+./bin/tests/system/acl/ns2/named2.conf.in	CONF-C	2008,2016,2018
+./bin/tests/system/acl/ns2/named3.conf.in	CONF-C	2008,2016,2018
+./bin/tests/system/acl/ns2/named4.conf.in	CONF-C	2008,2016,2018
+./bin/tests/system/acl/ns2/named5.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/acl/ns2/named6.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/acl/ns2/named7.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/acl/ns3/example.db		ZONE	2017
-./bin/tests/system/acl/ns3/named.conf		CONF-C	2017
+./bin/tests/system/acl/ns3/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/acl/ns4/example.db		ZONE	2017
 ./bin/tests/system/acl/ns4/existing.db		ZONE	2017
-./bin/tests/system/acl/ns4/named.conf		CONF-C	2017
-./bin/tests/system/acl/setup.sh			SH	2008,2012,2014,2016
-./bin/tests/system/acl/tests.sh			SH	2008,2012,2013,2014,2016,2017
-./bin/tests/system/additional/clean.sh		SH	2013,2014,2016,2017
+./bin/tests/system/acl/ns4/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/acl/setup.sh			SH	2008,2012,2014,2016,2018
+./bin/tests/system/acl/tests.sh			SH	2008,2012,2013,2014,2016,2017,2018
+./bin/tests/system/additional/clean.sh		SH	2013,2014,2016,2017,2018
 ./bin/tests/system/additional/ns1/mx.db		ZONE	2016
 ./bin/tests/system/additional/ns1/named.args	X	2013,2014
-./bin/tests/system/additional/ns1/named1.conf	CONF-C	2013,2016,2017
-./bin/tests/system/additional/ns1/named2.conf	CONF-C	2013,2016,2017
-./bin/tests/system/additional/ns1/named3.conf	CONF-C	2016,2017
-./bin/tests/system/additional/ns1/named4.conf	CONF-C	2016,2017
+./bin/tests/system/additional/ns1/named1.conf.in	CONF-C	2013,2016,2017,2018
+./bin/tests/system/additional/ns1/named2.conf.in	CONF-C	2013,2016,2017,2018
+./bin/tests/system/additional/ns1/named3.conf.in	CONF-C	2016,2017,2018
+./bin/tests/system/additional/ns1/named4.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/additional/ns1/naptr.db	ZONE	2013,2016
 ./bin/tests/system/additional/ns1/naptr2.db	ZONE	2013,2016
 ./bin/tests/system/additional/ns1/nid.db	ZONE	2013,2016
 ./bin/tests/system/additional/ns1/rt.db		ZONE	2013,2016
 ./bin/tests/system/additional/ns1/rt2.db	ZONE	2013,2016
 ./bin/tests/system/additional/ns1/srv.db	ZONE	2016
-./bin/tests/system/additional/ns3/named.conf	CONF-C	2017
+./bin/tests/system/additional/ns3/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/additional/ns3/root.hint	ZONE	2017
-./bin/tests/system/additional/setup.sh		SH	2013,2016
-./bin/tests/system/additional/tests.sh		SH	2013,2016,2017
-./bin/tests/system/addzone/clean.sh		SH	2010,2012,2013,2014,2015,2016,2017
+./bin/tests/system/additional/setup.sh		SH	2013,2016,2018
+./bin/tests/system/additional/tests.sh		SH	2013,2016,2017,2018
+./bin/tests/system/addzone/clean.sh		SH	2010,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/addzone/ns1/inlineslave.db	ZONE	2013,2016
-./bin/tests/system/addzone/ns1/named.conf	CONF-C	2013,2016,2017
+./bin/tests/system/addzone/ns1/named.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/addzone/ns1/redirect.db.1	ZONE	2017
 ./bin/tests/system/addzone/ns1/redirect.db.2	ZONE	2017
 ./bin/tests/system/addzone/ns2/.gitignore	X	2018
@@ -659,21 +659,22 @@
 ./bin/tests/system/addzone/ns2/default.nzf.in	X	2010
 ./bin/tests/system/addzone/ns2/hints.db		ZONE	2016
 ./bin/tests/system/addzone/ns2/inline.db	ZONE	2013,2016
-./bin/tests/system/addzone/ns2/named1.conf	CONF-C	2010,2016
-./bin/tests/system/addzone/ns2/named2.conf	CONF-C	2010,2011,2016
-./bin/tests/system/addzone/ns2/named3.conf	CONF-C	2017
+./bin/tests/system/addzone/ns2/named1.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/addzone/ns2/named2.conf.in	CONF-C	2010,2011,2016,2018
+./bin/tests/system/addzone/ns2/named3.conf.in	CONF-C	2017,2018
 ./bin/tests/system/addzone/ns2/normal.db	ZONE	2010,2016
 ./bin/tests/system/addzone/ns2/previous.db	ZONE	2010,2016
 ./bin/tests/system/addzone/ns2/redirect.db.1	ZONE	2016,2017
 ./bin/tests/system/addzone/ns2/redirect.db.2	ZONE	2016,2017
 ./bin/tests/system/addzone/ns3/e.db		ZONE	2017
-./bin/tests/system/addzone/ns3/named1.conf	CONF-C	2017
-./bin/tests/system/addzone/ns3/named2.conf	CONF-C	2017
+./bin/tests/system/addzone/ns3/named1.conf.in	CONF-C	2017,2018
+./bin/tests/system/addzone/ns3/named2.conf.in	CONF-C	2017,2018
 ./bin/tests/system/addzone/ns3/redirect.db.1	ZONE	2017
 ./bin/tests/system/addzone/ns3/redirect.db.2	ZONE	2017
-./bin/tests/system/addzone/setup.sh		SH	2010,2012,2013,2014,2016,2017
-./bin/tests/system/addzone/tests.sh		SH	2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/allow_query/clean.sh		SH	2010,2012,2014,2015,2016
+./bin/tests/system/addzone/setup.sh		SH	2010,2012,2013,2014,2016,2017,2018
+./bin/tests/system/addzone/tests.sh		SH	2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/allow_query/.gitignore	X	2018
+./bin/tests/system/allow_query/clean.sh		SH	2010,2012,2014,2015,2016,2018
 ./bin/tests/system/allow_query/ns2/aclallow.db	ZONE	2010,2016
 ./bin/tests/system/allow_query/ns2/acldisallow.db	ZONE	2010,2016
 ./bin/tests/system/allow_query/ns2/aclnotallow.db	ZONE	2010,2016
@@ -684,53 +685,54 @@
 ./bin/tests/system/allow_query/ns2/any.db	ZONE	2010,2016
 ./bin/tests/system/allow_query/ns2/keyallow.db	ZONE	2010,2016
 ./bin/tests/system/allow_query/ns2/keydisallow.db	ZONE	2010,2016
-./bin/tests/system/allow_query/ns2/named01.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named02.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named03.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named04.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named05.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named06.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named07.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named08.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named09.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named10.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named11.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named12.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named21.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named22.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named23.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named24.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named25.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named26.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named27.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named28.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named29.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named30.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named31.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named32.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named33.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named34.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named40.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named53.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named54.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named55.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named56.conf	CONF-C	2010,2016
-./bin/tests/system/allow_query/ns2/named57.conf	CONF-C	2013,2016
+./bin/tests/system/allow_query/ns2/named01.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named02.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named03.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named04.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named05.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named06.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named07.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named08.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named09.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named10.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named11.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named12.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named21.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named22.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named23.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named24.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named25.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named26.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named27.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named28.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named29.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named30.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named31.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named32.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named33.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named34.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named40.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named53.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named54.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named55.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named56.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/allow_query/ns2/named57.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/allow_query/ns2/none.db	ZONE	2010,2016
 ./bin/tests/system/allow_query/ns2/normal.db	ZONE	2010,2016
 ./bin/tests/system/allow_query/ns2/previous.db	ZONE	2010,2016
-./bin/tests/system/allow_query/setup.sh		SH	2010,2012,2016
-./bin/tests/system/allow_query/tests.sh		SH	2010,2012,2013,2016
-./bin/tests/system/ans.pl			PERL	2011,2012,2014,2016,2017
+./bin/tests/system/allow_query/setup.sh		SH	2010,2012,2016,2018
+./bin/tests/system/allow_query/tests.sh		SH	2010,2012,2013,2016,2018
+./bin/tests/system/ans.pl			PERL	2011,2012,2014,2016,2017,2018
 ./bin/tests/system/auth/clean.sh		SH	2018
 ./bin/tests/system/auth/ns1/example.com.db	ZONE	2018
 ./bin/tests/system/auth/ns1/example.net.db	ZONE	2018
-./bin/tests/system/auth/ns1/named.conf		CONF-C	2018
-./bin/tests/system/auth/ns2/named.conf		CONF-C	2018
+./bin/tests/system/auth/ns1/named.conf.in	CONF-C	2018
+./bin/tests/system/auth/ns2/named.conf.in	CONF-C	2018
+./bin/tests/system/auth/setup.sh		SH	2018
 ./bin/tests/system/auth/tests.sh		SH	2018
-./bin/tests/system/autosign/clean.sh		SH	2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/autosign/clean.sh		SH	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/autosign/ns1/keygen.sh	SH	2009,2010,2011,2012,2014,2016,2017
-./bin/tests/system/autosign/ns1/named.conf	CONF-C	2009,2013,2016
+./bin/tests/system/autosign/ns1/named.conf.in	CONF-C	2009,2013,2016,2018
 ./bin/tests/system/autosign/ns1/root.db.in	ZONE	2009,2010,2016
 ./bin/tests/system/autosign/ns2/Xbar.+005+30676.key	X	2010
 ./bin/tests/system/autosign/ns2/Xbar.+005+30676.private	X	2010
@@ -743,7 +745,7 @@
 ./bin/tests/system/autosign/ns2/example.db.in	ZONE	2009,2010,2016
 ./bin/tests/system/autosign/ns2/insecure.secure.example.db	ZONE	2009,2016
 ./bin/tests/system/autosign/ns2/keygen.sh	SH	2009,2010,2011,2012,2014,2015,2016,2017
-./bin/tests/system/autosign/ns2/named.conf	CONF-C	2009,2010,2011,2013,2016
+./bin/tests/system/autosign/ns2/named.conf.in	CONF-C	2009,2010,2011,2013,2016,2018
 ./bin/tests/system/autosign/ns2/private.secure.example.db.in	ZONE	2009,2016
 ./bin/tests/system/autosign/ns3/.gitignore	X	2012
 ./bin/tests/system/autosign/ns3/autonsec3.example.db.in	ZONE	2011,2016
@@ -756,7 +758,7 @@
 ./bin/tests/system/autosign/ns3/insecure.example.db	ZONE	2009,2016
 ./bin/tests/system/autosign/ns3/keygen.sh	SH	2009,2010,2011,2012,2014,2015,2016,2017
 ./bin/tests/system/autosign/ns3/kskonly.example.db.in	ZONE	2017
-./bin/tests/system/autosign/ns3/named.conf	CONF-C	2009,2010,2011,2012,2013,2015,2016,2017
+./bin/tests/system/autosign/ns3/named.conf.in	CONF-C	2009,2010,2011,2012,2013,2015,2016,2017,2018
 ./bin/tests/system/autosign/ns3/nozsk.example.db.in	ZONE	2011,2016
 ./bin/tests/system/autosign/ns3/nsec.example.db.in	ZONE	2010,2016
 ./bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in	ZONE	2010,2016
@@ -779,43 +781,46 @@
 ./bin/tests/system/autosign/ns3/ttl2.example.db.in	ZONE	2011,2016
 ./bin/tests/system/autosign/ns3/ttl3.example.db.in	ZONE	2011,2016
 ./bin/tests/system/autosign/ns3/ttl4.example.db.in	ZONE	2011,2016
-./bin/tests/system/autosign/ns4/named.conf	CONF-C	2009,2016,2017
-./bin/tests/system/autosign/ns5/named.conf	CONF-C	2009,2016,2017
+./bin/tests/system/autosign/ns4/named.conf.in	CONF-C	2009,2016,2017,2018
+./bin/tests/system/autosign/ns5/named.conf.in	CONF-C	2009,2016,2017,2018
 ./bin/tests/system/autosign/prereq.sh		SH	2009,2010,2012,2014,2016
-./bin/tests/system/autosign/setup.sh		SH	2009,2010,2012,2014,2016,2017
-./bin/tests/system/autosign/tests.sh		SH	2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/builtin/clean.sh		SH	2014,2016
-./bin/tests/system/builtin/ns1/named.conf	CONF-C	2011,2016
-./bin/tests/system/builtin/ns2/named.conf	CONF-C	2014,2016
-./bin/tests/system/builtin/ns3/named.conf	CONF-C	2014,2016
-./bin/tests/system/builtin/tests.sh		SH	2011,2012,2014,2015,2016
-./bin/tests/system/cacheclean/clean.sh		SH	2001,2004,2007,2011,2012,2014,2015,2016
+./bin/tests/system/autosign/setup.sh		SH	2009,2010,2012,2014,2016,2017,2018
+./bin/tests/system/autosign/tests.sh		SH	2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/builtin/clean.sh		SH	2014,2016,2018
+./bin/tests/system/builtin/ns1/named.conf.in	CONF-C	2011,2016,2018
+./bin/tests/system/builtin/ns2/named.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/builtin/ns3/named.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/builtin/setup.sh		SH	2018
+./bin/tests/system/builtin/tests.sh		SH	2011,2012,2014,2015,2016,2018
+./bin/tests/system/cacheclean/clean.sh		SH	2001,2004,2007,2011,2012,2014,2015,2016,2018
 ./bin/tests/system/cacheclean/dig.batch		X	2001
 ./bin/tests/system/cacheclean/knowngood.dig.out	X	2001
 ./bin/tests/system/cacheclean/ns1/example.db	ZONE	2001,2004,2007,2012,2016
 ./bin/tests/system/cacheclean/ns1/expire-test.db	ZONE	2014,2016
 ./bin/tests/system/cacheclean/ns1/flushtest.db	ZONE	2011,2016
-./bin/tests/system/cacheclean/ns1/named.conf	CONF-C	2001,2004,2005,2007,2011,2014,2016,2017
-./bin/tests/system/cacheclean/ns2/named.conf	CONF-C	2001,2004,2005,2007,2011,2013,2014,2015,2016
-./bin/tests/system/cacheclean/tests.sh		SH	2001,2004,2007,2011,2012,2013,2014,2016
-./bin/tests/system/case/clean.sh		SH	2013,2014,2015,2016
+./bin/tests/system/cacheclean/ns1/named.conf.in	CONF-C	2001,2004,2005,2007,2011,2014,2016,2017,2018
+./bin/tests/system/cacheclean/ns2/named.conf.in	CONF-C	2001,2004,2005,2007,2011,2013,2014,2015,2016,2018
+./bin/tests/system/cacheclean/setup.sh		SH	2018
+./bin/tests/system/cacheclean/tests.sh		SH	2001,2004,2007,2011,2012,2013,2014,2016,2018
+./bin/tests/system/case/clean.sh		SH	2013,2014,2015,2016,2018
 ./bin/tests/system/case/dynamic.good		X	2015
 ./bin/tests/system/case/ns1/dynamic.db.in	ZONE	2015,2016
 ./bin/tests/system/case/ns1/example.db		ZONE	2013,2016
-./bin/tests/system/case/ns1/named.conf		CONF-C	2013,2015,2016,2017
-./bin/tests/system/case/ns2/named.conf		CONF-C	2014,2015,2016,2017
+./bin/tests/system/case/ns1/named.conf.in	CONF-C	2013,2015,2016,2017,2018
+./bin/tests/system/case/ns2/named.conf.in	CONF-C	2014,2015,2016,2017,2018
 ./bin/tests/system/case/postns1.good		X	2015
 ./bin/tests/system/case/postupdate.good		X	2015
-./bin/tests/system/case/setup.sh		SH	2015,2016
-./bin/tests/system/case/tests.sh		SH	2013,2014,2015,2016
-./bin/tests/system/catz/clean.sh		SH	2016
+./bin/tests/system/case/setup.sh		SH	2015,2016,2018
+./bin/tests/system/case/tests.sh		SH	2013,2014,2015,2016,2018
+./bin/tests/system/catz/.gitignore		X	2018
+./bin/tests/system/catz/clean.sh		SH	2016,2018
 ./bin/tests/system/catz/ns1/catalog.example.db.in	ZONE	2016
-./bin/tests/system/catz/ns1/named.conf		CONF-C	2016,2017
-./bin/tests/system/catz/ns2/named.conf.in	CONF-C	2016,2017
+./bin/tests/system/catz/ns1/named.conf.in	CONF-C	2016,2017,2018
+./bin/tests/system/catz/ns2/named.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/catz/ns3/dom5.example.db	ZONE	2016
 ./bin/tests/system/catz/ns3/dom6.example.db	ZONE	2016
-./bin/tests/system/catz/ns3/named.conf		CONF-C	2016
-./bin/tests/system/catz/setup.sh		SH	2016
+./bin/tests/system/catz/ns3/named.conf.in	CONF-C	2016,2018
+./bin/tests/system/catz/setup.sh		SH	2016,2018
 ./bin/tests/system/catz/tests.sh		SH	2016,2017,2018
 ./bin/tests/system/cds/.gitignore		X	2017
 ./bin/tests/system/cds/checkmtime.pl		PERL	2017
@@ -824,27 +829,27 @@
 ./bin/tests/system/cds/mangle.pl		PERL	2017
 ./bin/tests/system/cds/prereq.sh		SH	2017
 ./bin/tests/system/cds/setup.sh			SH	2017
-./bin/tests/system/cds/tests.sh			SH	2017
+./bin/tests/system/cds/tests.sh			SH	2017,2018
 ./bin/tests/system/chain/README			TXT.BRIEF	2017
-./bin/tests/system/chain/ans3/ans.pl		PERL	2017
+./bin/tests/system/chain/ans3/ans.pl		PERL	2017,2018
 ./bin/tests/system/chain/ans4/.gitignore	X	2017
-./bin/tests/system/chain/ans4/README.anspy	TXT.BRIEF	2017
-./bin/tests/system/chain/ans4/ans.py		PYTHON	2017
-./bin/tests/system/chain/clean.sh		SH	2011,2012,2014,2015,2016,2017
-./bin/tests/system/chain/ns1/named.conf		CONF-C	2011,2016,2017
+./bin/tests/system/chain/ans4/README.anspy	TXT.BRIEF	2017,2018
+./bin/tests/system/chain/ans4/ans.py		PYTHON	2017,2018
+./bin/tests/system/chain/clean.sh		SH	2011,2012,2014,2015,2016,2017,2018
+./bin/tests/system/chain/ns1/named.conf.in	CONF-C	2011,2016,2017,2018
 ./bin/tests/system/chain/ns1/root.db		ZONE	2011,2016,2017
 ./bin/tests/system/chain/ns2/example.db		ZONE	2011,2016,2017
 ./bin/tests/system/chain/ns2/generic.db		ZONE	2017
-./bin/tests/system/chain/ns2/named.conf		CONF-C	2011,2016,2017
+./bin/tests/system/chain/ns2/named.conf.in	CONF-C	2011,2016,2017,2018
 ./bin/tests/system/chain/ns2/sign.sh		SH	2017
 ./bin/tests/system/chain/ns2/sub.db		ZONE	2017
-./bin/tests/system/chain/ns5/named.conf		CONF-C	2017
+./bin/tests/system/chain/ns5/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/chain/ns5/sub.db		ZONE	2017
-./bin/tests/system/chain/ns7/named.conf		CONF-C	2017
+./bin/tests/system/chain/ns7/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/chain/ns7/root.hint		ZONE	2017
-./bin/tests/system/chain/prereq.sh		SH	2017
-./bin/tests/system/chain/setup.sh		SH	2017
-./bin/tests/system/chain/tests.sh		SH	2011,2012,2016,2017
+./bin/tests/system/chain/prereq.sh		SH	2017,2018
+./bin/tests/system/chain/setup.sh		SH	2017,2018
+./bin/tests/system/chain/tests.sh		SH	2011,2012,2016,2017,2018
 ./bin/tests/system/checkconf/altdb.conf		CONF-C	2014,2016
 ./bin/tests/system/checkconf/altdlz.conf	CONF-C	2014,2016
 ./bin/tests/system/checkconf/bad-acl.conf	CONF-C	2016
@@ -977,31 +982,31 @@
 ./bin/tests/system/checkds/prep.example.db	X	2017
 ./bin/tests/system/checkds/prep.example.ds.db	X	2017
 ./bin/tests/system/checkds/setup.sh		SH	2012,2013,2014,2016
-./bin/tests/system/checkds/tests.sh		SH	2012,2013,2014,2016,2017
+./bin/tests/system/checkds/tests.sh		SH	2012,2013,2014,2016,2017,2018
 ./bin/tests/system/checkds/wrong.example.dlv.example.dlv.db	X	2012
 ./bin/tests/system/checkds/wrong.example.dnskey.db	X	2012
 ./bin/tests/system/checkds/wrong.example.ds.db	X	2012
-./bin/tests/system/checknames/clean.sh		SH	2004,2007,2012,2014,2015,2016
+./bin/tests/system/checknames/clean.sh		SH	2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/checknames/ns1/fail.example.db.in	ZONE	2004,2007,2016
 ./bin/tests/system/checknames/ns1/fail.update.db.in	ZONE	2004,2007,2016
 ./bin/tests/system/checknames/ns1/ignore.example.db.in	ZONE	2004,2007,2016
 ./bin/tests/system/checknames/ns1/ignore.update.db.in	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns1/named.conf	CONF-C	2004,2005,2007,2016
+./bin/tests/system/checknames/ns1/named.conf.in	CONF-C	2004,2005,2007,2016,2018
 ./bin/tests/system/checknames/ns1/root.db	ZONE	2004,2007,2016
 ./bin/tests/system/checknames/ns1/warn.example.db.in	ZONE	2004,2007,2016
 ./bin/tests/system/checknames/ns1/warn.update.db.in	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns2/named.conf	CONF-C	2004,2007,2016,2017
+./bin/tests/system/checknames/ns2/named.conf.in	CONF-C	2004,2007,2016,2017,2018
 ./bin/tests/system/checknames/ns2/root.hints	ZONE	2004,2007,2016
-./bin/tests/system/checknames/ns3/named.conf	CONF-C	2004,2007,2016,2017
+./bin/tests/system/checknames/ns3/named.conf.in	CONF-C	2004,2007,2016,2017,2018
 ./bin/tests/system/checknames/ns3/root.hints	ZONE	2004,2007,2016
 ./bin/tests/system/checknames/ns4/master-ignore.update.db.in	ZONE	2014,2016
-./bin/tests/system/checknames/ns4/named.conf	CONF-C	2014,2016,2017
+./bin/tests/system/checknames/ns4/named.conf.in	CONF-C	2014,2016,2017,2018
 ./bin/tests/system/checknames/ns4/root.hints	ZONE	2014,2016
-./bin/tests/system/checknames/setup.sh		SH	2004,2007,2012,2014,2016
-./bin/tests/system/checknames/tests.sh		SH	2004,2007,2012,2013,2014,2015,2016
+./bin/tests/system/checknames/setup.sh		SH	2004,2007,2012,2014,2016,2018
+./bin/tests/system/checknames/tests.sh		SH	2004,2007,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/checkzone/clean.sh		SH	2011,2012,2013,2014,2016
 ./bin/tests/system/checkzone/setup.sh		SH	2014,2016
-./bin/tests/system/checkzone/tests.sh		SH	2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/checkzone/tests.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/checkzone/zones/.gitattributes	X	2015
 ./bin/tests/system/checkzone/zones/bad-badclass.raw	X	2015
 ./bin/tests/system/checkzone/zones/bad-caa-rr.db	ZONE	2015,2016
@@ -1036,10 +1041,10 @@
 ./bin/tests/system/checkzone/zones/test2.db	ZONE	2013,2016
 ./bin/tests/system/checkzone/zones/warn.inherit.origin.db	ZONE	2014,2016
 ./bin/tests/system/checkzone/zones/warn.inherited.owner.db	ZONE	2014,2016
-./bin/tests/system/clean.sh			SH	2015,2016
-./bin/tests/system/cleanall.sh			SH	2000,2001,2004,2007,2012,2014,2015,2016,2017
+./bin/tests/system/clean.sh			SH	2015,2016,2018
+./bin/tests/system/cleanall.sh			SH	2000,2001,2004,2007,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/cleanpkcs11.sh		SH	2010,2012,2014,2016
-./bin/tests/system/common/controls.conf		CONF-C	2000,2001,2004,2007,2013,2016
+./bin/tests/system/common/controls.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
 ./bin/tests/system/common/rndc.conf		CONF-C	2000,2001,2004,2007,2013,2016
 ./bin/tests/system/common/rndc.key		CONF-C	2011,2013,2016
 ./bin/tests/system/common/root.hint		ZONE	2000,2001,2004,2007,2016
@@ -1050,23 +1055,24 @@
 ./bin/tests/system/cookie/bad-cookie-badsha1.conf	CONF-C	2017
 ./bin/tests/system/cookie/bad-cookie-badsha256.conf	CONF-C	2017
 ./bin/tests/system/cookie/bad-cookie-toolong.conf	CONF-C	2014,2015,2016
-./bin/tests/system/cookie/clean.sh		SH	2014,2015,2016
+./bin/tests/system/cookie/clean.sh		SH	2014,2015,2016,2018
 ./bin/tests/system/cookie/good-cookie-sha1.conf	CONF-C	2017
 ./bin/tests/system/cookie/good-cookie-sha256.conf	CONF-C	2017
 ./bin/tests/system/cookie/ns1/example.db	ZONE	2014,2015,2016
-./bin/tests/system/cookie/ns1/named.conf	CONF-C	2014,2015,2016,2017
+./bin/tests/system/cookie/ns1/named.conf.in	CONF-C	2014,2015,2016,2017,2018
 ./bin/tests/system/cookie/ns1/root.hint		ZONE	2014,2015,2016
-./bin/tests/system/cookie/ns2/named.conf	CONF-C	2014,2015,2016,2017
+./bin/tests/system/cookie/ns2/named.conf.in	CONF-C	2014,2015,2016,2017,2018
 ./bin/tests/system/cookie/ns2/root.db		ZONE	2014,2015,2016
-./bin/tests/system/cookie/ns3/named.conf	CONF-C	2015,2016,2017
+./bin/tests/system/cookie/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/cookie/ns3/root.hint		ZONE	2015,2016
-./bin/tests/system/cookie/ns4/named.conf	CONF-C	2017
+./bin/tests/system/cookie/ns4/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/cookie/ns4/root.hint		ZONE	2017
-./bin/tests/system/cookie/ns5/named.conf	CONF-C	2017
+./bin/tests/system/cookie/ns5/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/cookie/ns5/root.hint		ZONE	2017
-./bin/tests/system/cookie/ns6/named.conf	CONF-C	2017
+./bin/tests/system/cookie/ns6/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/cookie/ns6/root.hint		ZONE	2017
-./bin/tests/system/cookie/tests.sh		SH	2014,2015,2016,2017
+./bin/tests/system/cookie/setup.sh		SH	2018
+./bin/tests/system/cookie/tests.sh		SH	2014,2015,2016,2017,2018
 ./bin/tests/system/coverage/01-ksk-inactive/README	X	2013
 ./bin/tests/system/coverage/01-ksk-inactive/expect	X	2013
 ./bin/tests/system/coverage/02-zsk-inactive/README	X	2013
@@ -1090,14 +1096,14 @@
 ./bin/tests/system/coverage/11-cutoff/README	X	2014
 ./bin/tests/system/coverage/11-cutoff/expect	X	2014
 ./bin/tests/system/coverage/clean.sh		SH	2013,2014,2016
-./bin/tests/system/coverage/prereq.sh		SH	2014,2016
+./bin/tests/system/coverage/prereq.sh		SH	2014,2016,2018
 ./bin/tests/system/coverage/setup.sh		SH	2013,2014,2016,2017
-./bin/tests/system/coverage/tests.sh		SH	2013,2014,2016
-./bin/tests/system/database/clean.sh		SH	2011,2012,2014,2016
-./bin/tests/system/database/ns1/named.conf1	CONF-C	2011,2013,2016
-./bin/tests/system/database/ns1/named.conf2	CONF-C	2011,2013,2016
-./bin/tests/system/database/setup.sh		SH	2011,2012,2016
-./bin/tests/system/database/tests.sh		SH	2011,2012,2016
+./bin/tests/system/coverage/tests.sh		SH	2013,2014,2016,2018
+./bin/tests/system/database/clean.sh		SH	2011,2012,2014,2016,2018
+./bin/tests/system/database/ns1/named1.conf.in	CONF-C	2011,2013,2016,2018
+./bin/tests/system/database/ns1/named2.conf.in	CONF-C	2011,2013,2016,2018
+./bin/tests/system/database/setup.sh		SH	2011,2012,2016,2018
+./bin/tests/system/database/tests.sh		SH	2011,2012,2016,2018
 ./bin/tests/system/delzone/clean.sh		SH	2016
 ./bin/tests/system/delzone/ns1/inlineslave.db	ZONE	2016
 ./bin/tests/system/delzone/ns1/named.conf	CONF-C	2016
@@ -1118,44 +1124,45 @@
 ./bin/tests/system/dialup/tests.sh		SH	2000,2001,2004,2007,2012,2016
 ./bin/tests/system/digcomp.pl			PERL	2000,2001,2004,2007,2012,2013,2016
 ./bin/tests/system/digdelv/ans4/startme		X	2017
-./bin/tests/system/digdelv/clean.sh		SH	2015,2016
-./bin/tests/system/digdelv/ns1/named.conf	CONF-C	2015,2016
+./bin/tests/system/digdelv/clean.sh		SH	2015,2016,2018
+./bin/tests/system/digdelv/ns1/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/digdelv/ns1/root.db		ZONE	2015,2016
 ./bin/tests/system/digdelv/ns2/example.db	ZONE	2015,2016
-./bin/tests/system/digdelv/ns2/named.conf	CONF-C	2015,2016
-./bin/tests/system/digdelv/ns3/named.conf	CONF-C	2015,2016,2017
-./bin/tests/system/digdelv/tests.sh		SH	2015,2016,2017
+./bin/tests/system/digdelv/ns2/named.conf.in	CONF-C	2015,2016,2018
+./bin/tests/system/digdelv/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/digdelv/setup.sh		SH	2018
+./bin/tests/system/digdelv/tests.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/ditch.pl			PERL	2015,2016
-./bin/tests/system/dlv/clean.sh			SH	2004,2007,2010,2011,2012,2014,2016
-./bin/tests/system/dlv/ns1/named.conf		CONF-C	2004,2007,2011,2016
+./bin/tests/system/dlv/clean.sh			SH	2004,2007,2010,2011,2012,2014,2016,2018
+./bin/tests/system/dlv/ns1/named.conf.in	CONF-C	2004,2007,2011,2016,2018
 ./bin/tests/system/dlv/ns1/root.db.in		ZONE	2011,2016
 ./bin/tests/system/dlv/ns1/rootservers.utld.db	ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns1/sign.sh		SH	2011,2012,2014,2016
+./bin/tests/system/dlv/ns1/sign.sh		SH	2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/ns2/druz.db.in		ZONE	2011,2016
 ./bin/tests/system/dlv/ns2/hints		ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns2/named.conf		CONF-C	2004,2007,2011,2016
-./bin/tests/system/dlv/ns2/sign.sh		SH	2011,2012,2014,2016
+./bin/tests/system/dlv/ns2/named.conf.in	CONF-C	2004,2007,2011,2016,2018
+./bin/tests/system/dlv/ns2/sign.sh		SH	2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/ns2/utld.db		ZONE	2004,2007,2016
 ./bin/tests/system/dlv/ns3/child.db.in		ZONE	2004,2007,2010,2016
 ./bin/tests/system/dlv/ns3/dlv.db.in		ZONE	2004,2007,2016
 ./bin/tests/system/dlv/ns3/hints		ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns3/named.conf		CONF-C	2004,2007,2011,2016
-./bin/tests/system/dlv/ns3/sign.sh		SH	2004,2007,2009,2010,2011,2012,2014,2016
+./bin/tests/system/dlv/ns3/named.conf.in	CONF-C	2004,2007,2011,2016,2018
+./bin/tests/system/dlv/ns3/sign.sh		SH	2004,2007,2009,2010,2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/ns4/child.db		ZONE	2004,2007,2016
 ./bin/tests/system/dlv/ns4/hints		ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns4/named.conf		CONF-C	2004,2007,2016
+./bin/tests/system/dlv/ns4/named.conf.in	CONF-C	2004,2007,2016,2018
 ./bin/tests/system/dlv/ns5/hints		ZONE	2004,2007,2016
-./bin/tests/system/dlv/ns5/named.conf		CONF-C	2004,2006,2007,2011,2013,2016,2017
+./bin/tests/system/dlv/ns5/named.conf.in	CONF-C	2004,2006,2007,2011,2013,2016,2017,2018
 ./bin/tests/system/dlv/ns5/rndc.conf		CONF-C	2004,2007,2013,2016
 ./bin/tests/system/dlv/ns6/child.db.in		ZONE	2010,2016
 ./bin/tests/system/dlv/ns6/hints		ZONE	2010,2016
-./bin/tests/system/dlv/ns6/named.conf		CONF-C	2010,2011,2016
-./bin/tests/system/dlv/ns6/sign.sh		SH	2010,2011,2012,2014,2016
+./bin/tests/system/dlv/ns6/named.conf.in	CONF-C	2010,2011,2016,2018
+./bin/tests/system/dlv/ns6/sign.sh		SH	2010,2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/prereq.sh		SH	2014,2016
-./bin/tests/system/dlv/setup.sh			SH	2004,2007,2009,2011,2012,2014,2016,2017
-./bin/tests/system/dlv/tests.sh			SH	2004,2007,2010,2011,2012,2016
+./bin/tests/system/dlv/setup.sh			SH	2004,2007,2009,2011,2012,2014,2016,2017,2018
+./bin/tests/system/dlv/tests.sh			SH	2004,2007,2010,2011,2012,2016,2018
 ./bin/tests/system/dlz/.gitignore		X	2012
-./bin/tests/system/dlz/clean.sh			SH	2010,2012,2014,2016
+./bin/tests/system/dlz/clean.sh			SH	2010,2012,2014,2016,2018
 ./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=	TXT.BRIEF	2015,2016
 ./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=	TXT.BRIEF	2015,2016
 ./bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=	TXT.BRIEF	2015,2016
@@ -1163,20 +1170,22 @@
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=	TXT.BRIEF	2010,2016
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=	TXT.BRIEF	2010,2016
 ./bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1	TXT.BRIEF	2010,2016
-./bin/tests/system/dlz/ns1/named.conf		CONF-C	2010,2012,2016
-./bin/tests/system/dlz/prereq.sh.in		SH	2011,2012,2016
-./bin/tests/system/dlz/tests.sh			SH	2010,2011,2012,2013,2015,2016
+./bin/tests/system/dlz/ns1/named.conf.in	CONF-C	2010,2012,2016,2018
+./bin/tests/system/dlz/prereq.sh.in		SH	2011,2012,2016,2018
+./bin/tests/system/dlz/setup.sh			SH	2018
+./bin/tests/system/dlz/tests.sh			SH	2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/dlzexternal/Makefile.in	MAKE	2011,2012,2014,2015,2016,2017
-./bin/tests/system/dlzexternal/clean.sh		SH	2010,2012,2014,2015,2016
+./bin/tests/system/dlzexternal/clean.sh		SH	2010,2012,2014,2015,2016,2018
 ./bin/tests/system/dlzexternal/driver.c		C	2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/system/dlzexternal/driver.h		C	2011,2016
-./bin/tests/system/dlzexternal/ns1/.gitignore	X	2012
-./bin/tests/system/dlzexternal/ns1/named.conf.in	CONF-C	2011,2012,2013,2014,2016
+./bin/tests/system/dlzexternal/ns1/.gitignore	X	2012,2018
+./bin/tests/system/dlzexternal/ns1/dlzs.conf.in	CONF-C	2018
+./bin/tests/system/dlzexternal/ns1/named.conf.in	CONF-C	2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dlzexternal/ns1/root.db	ZONE	2014,2016
-./bin/tests/system/dlzexternal/prereq.sh	SH	2010,2011,2012,2014,2016
-./bin/tests/system/dlzexternal/setup.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/dlzexternal/tests.sh		SH	2010,2011,2012,2013,2014,2015,2016
-./bin/tests/system/dns64/clean.sh		SH	2010,2012,2014,2015,2016
+./bin/tests/system/dlzexternal/prereq.sh	SH	2010,2011,2012,2014,2016,2018
+./bin/tests/system/dlzexternal/setup.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/dlzexternal/tests.sh		SH	2010,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/dns64/clean.sh		SH	2010,2012,2014,2015,2016,2018
 ./bin/tests/system/dns64/conf/bad1.conf		CONF-C	2010,2016
 ./bin/tests/system/dns64/conf/bad2.conf		CONF-C	2010,2016
 ./bin/tests/system/dns64/conf/bad3.conf		CONF-C	2010,2016
@@ -1192,18 +1201,18 @@
 ./bin/tests/system/dns64/conf/good4.conf	CONF-C	2010,2016
 ./bin/tests/system/dns64/conf/good5.conf	CONF-C	2010,2016
 ./bin/tests/system/dns64/ns1/example.db		ZONE	2010,2011,2013,2016
-./bin/tests/system/dns64/ns1/named.conf		CONF-C	2010,2016
+./bin/tests/system/dns64/ns1/named.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/dns64/ns1/root.db		ZONE	2010,2016
 ./bin/tests/system/dns64/ns1/sign.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/dns64/ns2/named.conf		CONF-C	2010,2011,2013,2016
+./bin/tests/system/dns64/ns2/named.conf.in	CONF-C	2010,2011,2013,2016,2018
 ./bin/tests/system/dns64/ns2/rpz.db		ZONE	2013,2016
 ./bin/tests/system/dns64/prereq.sh		SH	2014,2016
-./bin/tests/system/dns64/setup.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/dns64/tests.sh		SH	2010,2011,2012,2013,2014,2016
+./bin/tests/system/dns64/setup.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/dns64/tests.sh		SH	2010,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dnssec/README		TXT.BRIEF	2000,2001,2002,2004,2011,2016
-./bin/tests/system/dnssec/clean.sh		SH	2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/dnssec/dnssec_update_test.pl	PERL	2002,2004,2007,2010,2012,2016
-./bin/tests/system/dnssec/ns1/named.conf	CONF-C	2000,2001,2004,2006,2007,2016
+./bin/tests/system/dnssec/clean.sh		SH	2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/dnssec/dnssec_update_test.pl	PERL	2002,2004,2007,2010,2012,2016,2018
+./bin/tests/system/dnssec/ns1/named.conf.in	CONF-C	2000,2001,2004,2006,2007,2016,2018
 ./bin/tests/system/dnssec/ns1/root.db.in	ZONE	2000,2001,2004,2007,2010,2013,2014,2016
 ./bin/tests/system/dnssec/ns1/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017
 ./bin/tests/system/dnssec/ns2/algroll.db.in	ZONE	2010,2016
@@ -1223,7 +1232,7 @@
 ./bin/tests/system/dnssec/ns2/example.db.in	ZONE	2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2016
 ./bin/tests/system/dnssec/ns2/in-addr.arpa.db.in	ZONE	2014,2016
 ./bin/tests/system/dnssec/ns2/insecure.secure.example.db	ZONE	2000,2001,2004,2007,2013,2016
-./bin/tests/system/dnssec/ns2/named.conf	CONF-C	2000,2001,2002,2004,2006,2007,2008,2010,2011,2014,2015,2016,2017
+./bin/tests/system/dnssec/ns2/named.conf.in	CONF-C	2000,2001,2002,2004,2006,2007,2008,2010,2011,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/ns2/private.secure.example.db.in	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/dnssec/ns2/rfc2335.example.db	X	2004
 ./bin/tests/system/dnssec/ns2/sign.sh		SH	2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017
@@ -1247,7 +1256,7 @@
 ./bin/tests/system/dnssec/ns3/lower.example.db.in	ZONE	2012,2016
 ./bin/tests/system/dnssec/ns3/managed-future.example.db.in	ZONE	2016
 ./bin/tests/system/dnssec/ns3/multiple.example.db.in	ZONE	2006,2008,2016
-./bin/tests/system/dnssec/ns3/named.conf	CONF-C	2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017
+./bin/tests/system/dnssec/ns3/named.conf.in	CONF-C	2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/dnssec/ns3/nosign.example.db.in	ZONE	2011,2016
 ./bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in	ZONE	2006,2008,2016
 ./bin/tests/system/dnssec/ns3/nsec3.example.db.in	ZONE	2006,2008,2016
@@ -1273,31 +1282,31 @@
 ./bin/tests/system/dnssec/ns3/ttlpatch.example.db.in	ZONE	2011,2016
 ./bin/tests/system/dnssec/ns3/update-nsec3.example.db.in	ZONE	2011,2016
 ./bin/tests/system/dnssec/ns3/upper.example.db.in	ZONE	2012,2016
-./bin/tests/system/dnssec/ns4/named1.conf	CONF-C	2011,2013,2014,2016,2017
-./bin/tests/system/dnssec/ns4/named2.conf	CONF-C	2011,2013,2016,2017
-./bin/tests/system/dnssec/ns4/named3.conf	CONF-C	2012,2013,2016,2017
-./bin/tests/system/dnssec/ns4/named4.conf	CONF-C	2013,2016,2017
+./bin/tests/system/dnssec/ns4/named1.conf.in	CONF-C	2011,2013,2014,2016,2017,2018
+./bin/tests/system/dnssec/ns4/named2.conf.in	CONF-C	2011,2013,2016,2017,2018
+./bin/tests/system/dnssec/ns4/named3.conf.in	CONF-C	2012,2013,2016,2017,2018
+./bin/tests/system/dnssec/ns4/named4.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/dnssec/ns5/.gitignore	X	2015
-./bin/tests/system/dnssec/ns5/named1.conf	CONF-C	2000,2001,2004,2006,2007,2015,2016,2017
-./bin/tests/system/dnssec/ns5/named2.conf	CONF-C	2000,2001,2004,2006,2007,2015,2016
+./bin/tests/system/dnssec/ns5/named1.conf.in	CONF-C	2000,2001,2004,2006,2007,2015,2016,2017,2018
+./bin/tests/system/dnssec/ns5/named2.conf.in	CONF-C	2000,2001,2004,2006,2007,2015,2016,2018
 ./bin/tests/system/dnssec/ns5/sign.sh		SH	2015,2016,2017
 ./bin/tests/system/dnssec/ns5/trusted.conf.bad	CONF-C	2000,2001,2004,2007,2016
 ./bin/tests/system/dnssec/ns6/named.args	X	2013,2014,2016
-./bin/tests/system/dnssec/ns6/named.conf	CONF-C	2004,2006,2007,2013,2016,2017
+./bin/tests/system/dnssec/ns6/named.conf.in	CONF-C	2004,2006,2007,2013,2016,2017,2018
 ./bin/tests/system/dnssec/ns6/optout-tld.db.in	ZONE	2013,2016
 ./bin/tests/system/dnssec/ns6/sign.sh		SH	2013,2014,2016,2017
-./bin/tests/system/dnssec/ns7/named.conf	CONF-C	2006,2008,2010,2014,2016
+./bin/tests/system/dnssec/ns7/named.conf.in	CONF-C	2006,2008,2010,2014,2016,2018
 ./bin/tests/system/dnssec/ns7/named.nosoa	TXT.BRIEF	2010,2016
 ./bin/tests/system/dnssec/ns7/nosoa.secure.example.db	ZONE	2010,2016
 ./bin/tests/system/dnssec/ns7/sign.sh		SH	2014,2016,2017
 ./bin/tests/system/dnssec/ns7/split-rrsig.db.in	ZONE	2014,2016
 ./bin/tests/system/dnssec/ntadiff.pl		PERL	2015,2016
-./bin/tests/system/dnssec/prereq.sh		SH	2000,2001,2002,2004,2006,2007,2009,2012,2014,2015,2016
-./bin/tests/system/dnssec/setup.sh		SH	2000,2001,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/dnssec/prereq.sh		SH	2000,2001,2002,2004,2006,2007,2009,2012,2014,2015,2016,2018
+./bin/tests/system/dnssec/setup.sh		SH	2000,2001,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/signer/example.db.in	ZONE	2010,2016
 ./bin/tests/system/dnssec/signer/remove.db.in	ZONE	2016
 ./bin/tests/system/dnssec/signer/remove2.db.in	ZONE	2016
-./bin/tests/system/dnssec/tests.sh		SH	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/dnssec/tests.sh		SH	2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf	CONF-C	2016
 ./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf	CONF-C	2016
 ./bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf	CONF-C	2016
@@ -1311,7 +1320,7 @@
 ./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf	CONF-C	2016
 ./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf	CONF-C	2016
 ./bin/tests/system/dnstap/bad-size-version.conf	CONF-C	2017
-./bin/tests/system/dnstap/clean.sh		SH	2015,2016,2017
+./bin/tests/system/dnstap/clean.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf	CONF-C	2016
 ./bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf	CONF-C	2016
 ./bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf	CONF-C	2016
@@ -1322,49 +1331,51 @@
 ./bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf	CONF-C	2016
 ./bin/tests/system/dnstap/good-size-unlimited.conf	CONF-C	2017
 ./bin/tests/system/dnstap/good-size-version.conf	CONF-C	2017
-./bin/tests/system/dnstap/ns1/named.conf	CONF-C	2015,2016,2017
+./bin/tests/system/dnstap/ns1/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/dnstap/ns1/root.db		ZONE	2015,2016
 ./bin/tests/system/dnstap/ns2/example.db	ZONE	2015,2016
-./bin/tests/system/dnstap/ns2/named.conf	CONF-C	2015,2016,2017
-./bin/tests/system/dnstap/ns3/named.conf	CONF-C	2015,2016,2017
-./bin/tests/system/dnstap/ns4/named.conf	CONF-C	2016
-./bin/tests/system/dnstap/tests.sh		SH	2015,2016,2017
-./bin/tests/system/dnstap/ydump.py		PYTHON	2016,2017
-./bin/tests/system/dscp/clean.sh		SH	2013,2014,2015,2016
+./bin/tests/system/dnstap/ns2/named.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/dnstap/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/dnstap/ns4/named.conf.in	CONF-C	2016,2018
+./bin/tests/system/dnstap/setup.sh		SH	2018
+./bin/tests/system/dnstap/tests.sh		SH	2015,2016,2017,2018
+./bin/tests/system/dnstap/ydump.py		PYTHON	2016,2017,2018
+./bin/tests/system/dscp/clean.sh		SH	2013,2014,2015,2016,2018
 ./bin/tests/system/dscp/ns1/named.args		X	2013,2014
-./bin/tests/system/dscp/ns1/named.conf		CONF-C	2013,2016
+./bin/tests/system/dscp/ns1/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/dscp/ns1/root.db		ZONE	2013,2016
 ./bin/tests/system/dscp/ns2/named.args		X	2013,2014
-./bin/tests/system/dscp/ns2/named.conf		CONF-C	2013,2016
+./bin/tests/system/dscp/ns2/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/dscp/ns3/hint.db		ZONE	2013,2016
 ./bin/tests/system/dscp/ns3/named.args		X	2013,2014
-./bin/tests/system/dscp/ns3/named.conf		CONF-C	2013,2016
+./bin/tests/system/dscp/ns3/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/dscp/ns4/named.args		X	2013,2014
-./bin/tests/system/dscp/ns4/named.conf		CONF-C	2013,2016
+./bin/tests/system/dscp/ns4/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/dscp/ns4/root.db		ZONE	2013,2016
 ./bin/tests/system/dscp/ns5/named.args		X	2013,2014
-./bin/tests/system/dscp/ns5/named.conf		CONF-C	2013,2016
+./bin/tests/system/dscp/ns5/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/dscp/ns6/hint.db		ZONE	2013,2016
 ./bin/tests/system/dscp/ns6/named.args		X	2013,2014
-./bin/tests/system/dscp/ns6/named.conf		CONF-C	2013,2016
+./bin/tests/system/dscp/ns6/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/dscp/ns7/named.args		X	2013,2014
-./bin/tests/system/dscp/ns7/named.conf		CONF-C	2013,2016
-./bin/tests/system/dscp/tests.sh		SH	2013,2016
-./bin/tests/system/dsdigest/clean.sh		SH	2012,2014,2016
-./bin/tests/system/dsdigest/ns1/named.conf	CONF-C	2012,2016
+./bin/tests/system/dscp/ns7/named.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/dscp/setup.sh		SH	2018
+./bin/tests/system/dscp/tests.sh		SH	2013,2016,2018
+./bin/tests/system/dsdigest/clean.sh		SH	2012,2014,2016,2018
+./bin/tests/system/dsdigest/ns1/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/dsdigest/ns1/root.db.in	ZONE	2012,2016
 ./bin/tests/system/dsdigest/ns1/sign.sh		SH	2012,2014,2016
 ./bin/tests/system/dsdigest/ns2/bad.db.in	ZONE	2012,2016
 ./bin/tests/system/dsdigest/ns2/good.db.in	ZONE	2012,2016
-./bin/tests/system/dsdigest/ns2/named.conf	CONF-C	2012,2016
+./bin/tests/system/dsdigest/ns2/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/dsdigest/ns2/sign.sh		SH	2012,2014,2016
-./bin/tests/system/dsdigest/ns3/named.conf	CONF-C	2012,2016
-./bin/tests/system/dsdigest/ns4/named.conf	CONF-C	2012,2016
-./bin/tests/system/dsdigest/prereq.sh		SH	2012,2014,2016
-./bin/tests/system/dsdigest/setup.sh		SH	2012,2014,2016,2017
-./bin/tests/system/dsdigest/tests.sh		SH	2012,2016
+./bin/tests/system/dsdigest/ns3/named.conf.in	CONF-C	2012,2016,2018
+./bin/tests/system/dsdigest/ns4/named.conf.in	CONF-C	2012,2016,2018
+./bin/tests/system/dsdigest/prereq.sh		SH	2012,2014,2016,2018
+./bin/tests/system/dsdigest/setup.sh		SH	2012,2014,2016,2017,2018
+./bin/tests/system/dsdigest/tests.sh		SH	2012,2016,2018
 ./bin/tests/system/dyndb/Makefile.in		MAKE	2015,2016
-./bin/tests/system/dyndb/clean.sh		SH	2015,2016
+./bin/tests/system/dyndb/clean.sh		SH	2015,2016,2018
 ./bin/tests/system/dyndb/driver/.gitignore	X	2015
 ./bin/tests/system/dyndb/driver/AUTHORS		X	2015
 ./bin/tests/system/dyndb/driver/COPYING		X	2015,2016
@@ -1384,9 +1395,10 @@
 ./bin/tests/system/dyndb/driver/util.h		X	2015
 ./bin/tests/system/dyndb/driver/zone.c		X	2015
 ./bin/tests/system/dyndb/driver/zone.h		X	2015
-./bin/tests/system/dyndb/ns1/named.conf		CONF-C	2015,2016
-./bin/tests/system/dyndb/prereq.sh		SH	2015,2016
-./bin/tests/system/dyndb/tests.sh		SH	2015,2016
+./bin/tests/system/dyndb/ns1/named.conf.in	CONF-C	2015,2016,2018
+./bin/tests/system/dyndb/prereq.sh		SH	2015,2016,2018
+./bin/tests/system/dyndb/setup.sh		SH	2018
+./bin/tests/system/dyndb/tests.sh		SH	2015,2016,2018
 ./bin/tests/system/ecdsa/clean.sh		SH	2012,2014,2016
 ./bin/tests/system/ecdsa/ns1/named.conf		CONF-C	2012,2016
 ./bin/tests/system/ecdsa/ns1/root.db.in		ZONE	2012,2016
@@ -1409,34 +1421,35 @@
 ./bin/tests/system/eddsa/prereq.sh		SH	2017
 ./bin/tests/system/eddsa/setup.sh		SH	2017
 ./bin/tests/system/eddsa/tests.sh		SH	2017
-./bin/tests/system/ednscompliance/clean.sh	SH	2014,2015,2016
-./bin/tests/system/ednscompliance/ns1/named.conf	CONF-C	2014,2016
+./bin/tests/system/ednscompliance/clean.sh	SH	2014,2015,2016,2018
+./bin/tests/system/ednscompliance/ns1/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/ednscompliance/ns1/root.db	ZONE	2014,2016
-./bin/tests/system/ednscompliance/tests.sh	SH	2014,2015,2016
+./bin/tests/system/ednscompliance/setup.sh	SH	2018
+./bin/tests/system/ednscompliance/tests.sh	SH	2014,2015,2016,2018
 ./bin/tests/system/emptyzones/clean.sh		SH	2014,2015,2016
 ./bin/tests/system/emptyzones/ns1/empty.db	ZONE	2014,2016
-./bin/tests/system/emptyzones/ns1/named1.conf	CONF-C	2014,2016,2017
-./bin/tests/system/emptyzones/ns1/named2.conf	CONF-C	2014,2015,2016,2017
+./bin/tests/system/emptyzones/ns1/named1.conf.in	CONF-C	2014,2016,2017,2018
+./bin/tests/system/emptyzones/ns1/named2.conf.in	CONF-C	2014,2015,2016,2017,2018
 ./bin/tests/system/emptyzones/ns1/rfc1918.zones	CONF-C	2014,2016
 ./bin/tests/system/emptyzones/ns1/root.hint	ZONE	2014,2016
-./bin/tests/system/emptyzones/setup.sh		SH	2014,2016
-./bin/tests/system/emptyzones/tests.sh		SH	2014,2015,2016
+./bin/tests/system/emptyzones/setup.sh		SH	2014,2016,2018
+./bin/tests/system/emptyzones/tests.sh		SH	2014,2015,2016,2018
 ./bin/tests/system/feature-test.c		C	2016,2017
-./bin/tests/system/fetchlimit/ans4/ans.pl	PERL	2015,2016
-./bin/tests/system/fetchlimit/clean.sh		SH	2015,2016
-./bin/tests/system/fetchlimit/ns1/named.conf	CONF-C	2015,2016
+./bin/tests/system/fetchlimit/ans4/ans.pl	PERL	2015,2016,2018
+./bin/tests/system/fetchlimit/clean.sh		SH	2015,2016,2018
+./bin/tests/system/fetchlimit/ns1/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns1/root.db	ZONE	2015,2016
 ./bin/tests/system/fetchlimit/ns2/example.db	ZONE	2015,2016
-./bin/tests/system/fetchlimit/ns2/named.conf	CONF-C	2015,2016
+./bin/tests/system/fetchlimit/ns2/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/named.args	X	2015
-./bin/tests/system/fetchlimit/ns3/named1.conf	CONF-C	2015,2016
-./bin/tests/system/fetchlimit/ns3/named2.conf	CONF-C	2015,2016
-./bin/tests/system/fetchlimit/ns3/named3.conf	CONF-C	2015,2016
+./bin/tests/system/fetchlimit/ns3/named1.conf.in	CONF-C	2015,2016,2018
+./bin/tests/system/fetchlimit/ns3/named2.conf.in	CONF-C	2015,2016,2018
+./bin/tests/system/fetchlimit/ns3/named3.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/root.hint	ZONE	2015,2016
-./bin/tests/system/fetchlimit/setup.sh		SH	2015,2016
-./bin/tests/system/fetchlimit/tests.sh		SH	2015,2016
+./bin/tests/system/fetchlimit/setup.sh		SH	2015,2016,2018
+./bin/tests/system/fetchlimit/tests.sh		SH	2015,2016,2018
 ./bin/tests/system/filter-aaaa/.gitignore	X	2012,2014,2016
-./bin/tests/system/filter-aaaa/clean.sh		SH	2010,2012,2014,2016
+./bin/tests/system/filter-aaaa/clean.sh		SH	2010,2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/conf/bad1.conf	CONF-C	2010,2016
 ./bin/tests/system/filter-aaaa/conf/bad2.conf	CONF-C	2010,2016
 ./bin/tests/system/filter-aaaa/conf/bad3.conf	CONF-C	2010,2016
@@ -1451,52 +1464,54 @@
 ./bin/tests/system/filter-aaaa/conf/good6.conf	CONF-C	2010,2016
 ./bin/tests/system/filter-aaaa/conf/good7.conf	CONF-C	2010,2016
 ./bin/tests/system/filter-aaaa/conf/good8.conf	CONF-C	2010,2016
-./bin/tests/system/filter-aaaa/ns1/named1.conf	CONF-C	2012,2013,2016,2017
-./bin/tests/system/filter-aaaa/ns1/named2.conf	CONF-C	2012,2013,2016,2017
+./bin/tests/system/filter-aaaa/ns1/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns1/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/root.db	ZONE	2010,2012,2016,2017
-./bin/tests/system/filter-aaaa/ns1/sign.sh	SH	2010,2012,2014,2016
+./bin/tests/system/filter-aaaa/ns1/sign.sh	SH	2010,2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/ns1/signed.db.in	ZONE	2010,2012,2016,2017
 ./bin/tests/system/filter-aaaa/ns1/signed.db.presigned	X	2014,2017
 ./bin/tests/system/filter-aaaa/ns1/unsigned.db	ZONE	2010,2012,2016,2017
 ./bin/tests/system/filter-aaaa/ns2/hints	ZONE	2010,2016
-./bin/tests/system/filter-aaaa/ns2/named1.conf	CONF-C	2012,2013,2016,2017
-./bin/tests/system/filter-aaaa/ns2/named2.conf	CONF-C	2012,2013,2016,2017
+./bin/tests/system/filter-aaaa/ns2/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns2/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns3/hints	ZONE	2010,2016
-./bin/tests/system/filter-aaaa/ns3/named1.conf	CONF-C	2012,2013,2016,2017
-./bin/tests/system/filter-aaaa/ns3/named2.conf	CONF-C	2012,2013,2016,2017
-./bin/tests/system/filter-aaaa/ns4/named1.conf	CONF-C	2012,2013,2016,2017
-./bin/tests/system/filter-aaaa/ns4/named2.conf	CONF-C	2012,2013,2016,2017
+./bin/tests/system/filter-aaaa/ns3/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns3/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns4/named1.conf.in	CONF-C	2012,2013,2016,2017,2018
+./bin/tests/system/filter-aaaa/ns4/named2.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/root.db	ZONE	2010,2012,2016,2017
-./bin/tests/system/filter-aaaa/ns4/sign.sh	SH	2010,2012,2014,2016
+./bin/tests/system/filter-aaaa/ns4/sign.sh	SH	2010,2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/ns4/signed.db.in	ZONE	2010,2012,2016,2017
 ./bin/tests/system/filter-aaaa/ns4/signed.db.presigned	X	2014
 ./bin/tests/system/filter-aaaa/ns4/unsigned.db	ZONE	2010,2012,2016,2017
-./bin/tests/system/filter-aaaa/setup.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/filter-aaaa/tests.sh		SH	2010,2012,2015,2016
-./bin/tests/system/formerr/clean.sh		SH	2013,2014,2015,2016
+./bin/tests/system/filter-aaaa/setup.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/filter-aaaa/tests.sh		SH	2010,2012,2015,2016,2018
+./bin/tests/system/formerr/clean.sh		SH	2013,2014,2015,2016,2018
 ./bin/tests/system/formerr/formerr.pl		PERL	2013,2014,2016
 ./bin/tests/system/formerr/nametoolong		X	2013
 ./bin/tests/system/formerr/noquestions		X	2013
-./bin/tests/system/formerr/ns1/named.conf	CONF-C	2013,2016
+./bin/tests/system/formerr/ns1/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/formerr/ns1/root.db		ZONE	2013,2016
-./bin/tests/system/formerr/tests.sh		SH	2013,2015,2016
+./bin/tests/system/formerr/setup.sh		SH	2018
+./bin/tests/system/formerr/tests.sh		SH	2013,2015,2016,2018
 ./bin/tests/system/formerr/twoquestions		X	2013
-./bin/tests/system/forward/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016
+./bin/tests/system/forward/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/forward/ns1/example.db	X	2000,2001
-./bin/tests/system/forward/ns1/named.conf	CONF-C	2000,2001,2004,2007,2014,2016
+./bin/tests/system/forward/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2014,2016,2018
 ./bin/tests/system/forward/ns1/root.db		ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/forward/ns2/example.db	X	2000,2001
-./bin/tests/system/forward/ns2/named.conf	CONF-C	2000,2001,2004,2007,2013,2014,2016
+./bin/tests/system/forward/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2013,2014,2016,2018
 ./bin/tests/system/forward/ns2/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/forward/ns3/named.conf	CONF-C	2000,2001,2004,2007,2016
+./bin/tests/system/forward/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/forward/ns3/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/forward/ns4/named.conf	CONF-C	2000,2001,2004,2007,2013,2014,2016
+./bin/tests/system/forward/ns4/named.conf.in	CONF-C	2000,2001,2004,2007,2013,2014,2016,2018
 ./bin/tests/system/forward/ns4/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/forward/ns5/named.conf	CONF-C	2011,2016
+./bin/tests/system/forward/ns5/named.conf.in	CONF-C	2011,2016,2018
 ./bin/tests/system/forward/ns5/root.db		ZONE	2011,2016
 ./bin/tests/system/forward/rfc1918-inherited.conf	CONF-C	2016
 ./bin/tests/system/forward/rfc1918-notinherited.conf	CONF-C	2016
-./bin/tests/system/forward/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2016
+./bin/tests/system/forward/setup.sh		SH	2018
+./bin/tests/system/forward/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/forward/ula-inherited.conf	CONF-C	2016
 ./bin/tests/system/forward/ula-notinherited.conf	CONF-C	2016
 ./bin/tests/system/genzone.sh			SH	2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017
@@ -1525,36 +1540,36 @@
 ./bin/tests/system/geoip/data/GeoIPv6.dat	X	2013
 ./bin/tests/system/geoip/data/README		TXT.BRIEF	2013,2014,2016
 ./bin/tests/system/geoip/ns2/example.db.in	ZONE	2013,2016
-./bin/tests/system/geoip/ns2/named1.conf	CONF-C	2013,2014,2016
-./bin/tests/system/geoip/ns2/named10.conf	CONF-C	2014,2016
-./bin/tests/system/geoip/ns2/named11.conf	CONF-C	2013,2014,2016
-./bin/tests/system/geoip/ns2/named12.conf	CONF-C	2013,2014,2016
-./bin/tests/system/geoip/ns2/named13.conf	CONF-C	2014,2016
-./bin/tests/system/geoip/ns2/named14.conf	CONF-C	2014,2016
-./bin/tests/system/geoip/ns2/named15.conf	CONF-C	2014,2016
-./bin/tests/system/geoip/ns2/named2.conf	CONF-C	2013,2016
-./bin/tests/system/geoip/ns2/named3.conf	CONF-C	2013,2016
-./bin/tests/system/geoip/ns2/named4.conf	CONF-C	2013,2016
-./bin/tests/system/geoip/ns2/named5.conf	CONF-C	2013,2016
-./bin/tests/system/geoip/ns2/named6.conf	CONF-C	2013,2014,2016
-./bin/tests/system/geoip/ns2/named7.conf	CONF-C	2013,2016
-./bin/tests/system/geoip/ns2/named8.conf	CONF-C	2013,2016
-./bin/tests/system/geoip/ns2/named9.conf	CONF-C	2013,2016
+./bin/tests/system/geoip/ns2/named1.conf.in	CONF-C	2013,2014,2016,2018
+./bin/tests/system/geoip/ns2/named10.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/geoip/ns2/named11.conf.in	CONF-C	2013,2014,2016,2018
+./bin/tests/system/geoip/ns2/named12.conf.in	CONF-C	2013,2014,2016,2018
+./bin/tests/system/geoip/ns2/named13.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/geoip/ns2/named14.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/geoip/ns2/named15.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/geoip/ns2/named2.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/geoip/ns2/named3.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/geoip/ns2/named4.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/geoip/ns2/named5.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/geoip/ns2/named6.conf.in	CONF-C	2013,2014,2016,2018
+./bin/tests/system/geoip/ns2/named7.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/geoip/ns2/named8.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/geoip/ns2/named9.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/geoip/options.conf		CONF-C	2015,2016
-./bin/tests/system/geoip/prereq.sh		SH	2013,2014,2016
-./bin/tests/system/geoip/setup.sh		SH	2013,2014,2016
-./bin/tests/system/geoip/tests.sh		SH	2013,2014,2015,2016
-./bin/tests/system/glue/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016
+./bin/tests/system/geoip/prereq.sh		SH	2013,2014,2016,2018
+./bin/tests/system/geoip/setup.sh		SH	2013,2014,2016,2018
+./bin/tests/system/geoip/tests.sh		SH	2013,2014,2015,2016,2018
+./bin/tests/system/glue/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/glue/fi.good			X	2000,2001
 ./bin/tests/system/glue/noglue.good		X	2000,2001
 ./bin/tests/system/glue/ns1/cache.in		ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/glue/ns1/mil.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/glue/ns1/named.conf		CONF-C	2000,2001,2004,2005,2007,2009,2016
+./bin/tests/system/glue/ns1/named.conf.in	CONF-C	2000,2001,2004,2005,2007,2009,2016,2018
 ./bin/tests/system/glue/ns1/net.db		ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/glue/ns1/root-servers.nil.db	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/glue/ns1/root.db		ZONE	2000,2001,2004,2007,2016,2017
-./bin/tests/system/glue/setup.sh		SH	2001,2004,2007,2012,2016
-./bin/tests/system/glue/tests.sh		SH	2000,2001,2003,2004,2007,2012,2013,2016,2017
+./bin/tests/system/glue/setup.sh		SH	2001,2004,2007,2012,2016,2018
+./bin/tests/system/glue/tests.sh		SH	2000,2001,2003,2004,2007,2012,2013,2016,2017,2018
 ./bin/tests/system/glue/xx.good			X	2000,2001
 ./bin/tests/system/glue/yy.good			X	2000,2001,2003
 ./bin/tests/system/gost/clean.sh		SH	2010,2012,2014,2016
@@ -1570,55 +1585,56 @@
 ./bin/tests/system/inline/.gitignore		X	2014
 ./bin/tests/system/inline/checkdsa.sh.in	SH	2013,2014,2016
 ./bin/tests/system/inline/clean.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/inline/ns1/named.conf	CONF-C	2011,2016
+./bin/tests/system/inline/ns1/named.conf.in	CONF-C	2011,2016,2018
 ./bin/tests/system/inline/ns1/root.db.in	ZONE	2011,2012,2013,2016,2017
 ./bin/tests/system/inline/ns1/sign.sh		SH	2011,2012,2014,2016,2017
 ./bin/tests/system/inline/ns2/bits.db.in	ZONE	2011,2016
-./bin/tests/system/inline/ns2/named.conf	CONF-C	2011,2012,2013,2014,2016,2017
+./bin/tests/system/inline/ns2/named.conf.in	CONF-C	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/inline/ns2/nsec3-loop.db	ZONE	2017
 ./bin/tests/system/inline/ns3/master.db.in	ZONE	2011,2012,2016
 ./bin/tests/system/inline/ns3/master2.db.in	ZONE	2011,2012,2016
 ./bin/tests/system/inline/ns3/master3.db.in	ZONE	2012,2016
 ./bin/tests/system/inline/ns3/master4.db.in	ZONE	2012,2016
-./bin/tests/system/inline/ns3/named.conf	CONF-C	2011,2012,2013,2015,2016,2017
+./bin/tests/system/inline/ns3/named.conf.in	CONF-C	2011,2012,2013,2015,2016,2017,2018
 ./bin/tests/system/inline/ns3/sign.sh		SH	2011,2012,2013,2014,2016,2017
-./bin/tests/system/inline/ns4/named.conf	CONF-C	2011,2016
+./bin/tests/system/inline/ns4/named.conf.in	CONF-C	2011,2016,2018
 ./bin/tests/system/inline/ns4/noixfr.db.in	ZONE	2011,2016
-./bin/tests/system/inline/ns5/named.conf.post	CONF-C	2011,2014,2016
-./bin/tests/system/inline/ns5/named.conf.pre	CONF-C	2011,2016
-./bin/tests/system/inline/ns6/named.conf	CONF-C	2011,2016
-./bin/tests/system/inline/ns7/named.conf	CONF-C	2017
+./bin/tests/system/inline/ns5/named.conf.post	CONF-C	2011,2014,2016,2018
+./bin/tests/system/inline/ns5/named.conf.pre	CONF-C	2011,2016,2018
+./bin/tests/system/inline/ns6/named.conf.in	CONF-C	2011,2016,2018
+./bin/tests/system/inline/ns7/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/inline/ns7/sign.sh		SH	2017
 ./bin/tests/system/inline/prereq.sh		SH	2014,2016
-./bin/tests/system/inline/setup.sh		SH	2011,2012,2013,2014,2016,2017
+./bin/tests/system/inline/setup.sh		SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/inline/tests.sh		SH	2011,2012,2013,2014,2016,2017,2018
-./bin/tests/system/integrity/clean.sh		SH	2017
+./bin/tests/system/integrity/clean.sh		SH	2017,2018
 ./bin/tests/system/integrity/ns1/mx-cname.db	ZONE	2017
-./bin/tests/system/integrity/ns1/named.conf	CONF-C	2017
+./bin/tests/system/integrity/ns1/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/integrity/ns1/srv-cname.db	ZONE	2017
-./bin/tests/system/integrity/tests.sh		SH	2017
+./bin/tests/system/integrity/setup.sh		SH	2018
+./bin/tests/system/integrity/tests.sh		SH	2017,2018
 ./bin/tests/system/ixfr/ans2/startme		X	2011
-./bin/tests/system/ixfr/clean.sh		SH	2001,2004,2007,2011,2012,2014,2015,2016
+./bin/tests/system/ixfr/clean.sh		SH	2001,2004,2007,2011,2012,2014,2015,2016,2018
 ./bin/tests/system/ixfr/ns1/.gitignore		X	2012
 ./bin/tests/system/ixfr/ns1/startme		X	2012,2013
 ./bin/tests/system/ixfr/ns3/mytest0.db		ZONE	2011,2016
 ./bin/tests/system/ixfr/ns3/mytest1.db		ZONE	2011,2016
 ./bin/tests/system/ixfr/ns3/mytest2.db		ZONE	2011,2016
-./bin/tests/system/ixfr/ns3/named.conf		CONF-C	2011,2013,2014,2016
+./bin/tests/system/ixfr/ns3/named.conf.in	CONF-C	2011,2013,2014,2016,2018
 ./bin/tests/system/ixfr/ns3/subtest0.db		ZONE	2011,2016
 ./bin/tests/system/ixfr/ns3/subtest1.db		ZONE	2011,2016
-./bin/tests/system/ixfr/ns4/named.conf		CONF-C	2011,2013,2016
-./bin/tests/system/ixfr/prereq.sh		SH	2001,2004,2007,2012,2014,2016
-./bin/tests/system/ixfr/setup.sh		SH	2001,2004,2007,2011,2012,2013,2014,2016
-./bin/tests/system/ixfr/tests.sh		SH	2001,2004,2007,2011,2012,2014,2016
-./bin/tests/system/keepalive/clean.sh		SH	2017
+./bin/tests/system/ixfr/ns4/named.conf.in	CONF-C	2011,2013,2016,2018
+./bin/tests/system/ixfr/prereq.sh		SH	2001,2004,2007,2012,2014,2016,2018
+./bin/tests/system/ixfr/setup.sh		SH	2001,2004,2007,2011,2012,2013,2014,2016,2018
+./bin/tests/system/ixfr/tests.sh		SH	2001,2004,2007,2011,2012,2014,2016,2018
+./bin/tests/system/keepalive/clean.sh		SH	2017,2018
 ./bin/tests/system/keepalive/expected		X	2017
-./bin/tests/system/keepalive/ns1/named.conf	CONF-C	2017
+./bin/tests/system/keepalive/ns1/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/keepalive/ns1/root.db	ZONE	2017
 ./bin/tests/system/keepalive/ns2/example.db	ZONE	2017
-./bin/tests/system/keepalive/ns2/named.conf	CONF-C	2017
-./bin/tests/system/keepalive/ns3/named.conf	CONF-C	2017
-./bin/tests/system/keepalive/setup.sh		SH	2017
+./bin/tests/system/keepalive/ns2/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/keepalive/ns3/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/keepalive/setup.sh		SH	2017,2018
 ./bin/tests/system/keepalive/tests.sh		SH	2017,2018
 ./bin/tests/system/keymgr/01-ksk-inactive/README	TXT.BRIEF	2016
 ./bin/tests/system/keymgr/01-ksk-inactive/expect	X	2016
@@ -1661,145 +1677,148 @@
 ./bin/tests/system/keymgr/policy.conf		CONF-C	2016
 ./bin/tests/system/keymgr/policy.good		X	2016
 ./bin/tests/system/keymgr/policy.sample		CONF-C	2016,2017
-./bin/tests/system/keymgr/prereq.sh		SH	2016
-./bin/tests/system/keymgr/setup.sh		SH	2016,2017
+./bin/tests/system/keymgr/prereq.sh		SH	2016,2018
+./bin/tests/system/keymgr/setup.sh		SH	2016,2017,2018
 ./bin/tests/system/keymgr/testpolicy.py		PYTHON	2016
-./bin/tests/system/keymgr/tests.sh		SH	2016
+./bin/tests/system/keymgr/tests.sh		SH	2016,2018
 ./bin/tests/system/legacy/build.sh		SH	2014,2016,2017
-./bin/tests/system/legacy/clean.sh		SH	2014,2016
-./bin/tests/system/legacy/ns1/named1.conf	CONF-C	2014,2016
-./bin/tests/system/legacy/ns1/named2.conf	CONF-C	2014,2016
+./bin/tests/system/legacy/clean.sh		SH	2014,2016,2018
+./bin/tests/system/legacy/ns1/named1.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/legacy/ns1/named2.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns1/root.db		ZONE	2014,2016
 ./bin/tests/system/legacy/ns1/trusted.conf	X	2014
 ./bin/tests/system/legacy/ns2/dropedns.db	ZONE	2014,2016
-./bin/tests/system/legacy/ns2/named.conf	CONF-C	2014,2016
+./bin/tests/system/legacy/ns2/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns2/named.dropedns	X	2014
 ./bin/tests/system/legacy/ns3/dropedns-notcp.db	ZONE	2014,2016
-./bin/tests/system/legacy/ns3/named.conf	CONF-C	2014,2016
+./bin/tests/system/legacy/ns3/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns3/named.dropedns	X	2014
 ./bin/tests/system/legacy/ns3/named.notcp	X	2014
 ./bin/tests/system/legacy/ns4/named.args	X	2014
-./bin/tests/system/legacy/ns4/named.conf	CONF-C	2014,2016
+./bin/tests/system/legacy/ns4/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns4/plain.db		ZONE	2014,2016
 ./bin/tests/system/legacy/ns5/named.args	X	2014
-./bin/tests/system/legacy/ns5/named.conf	CONF-C	2014,2016
+./bin/tests/system/legacy/ns5/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns5/named.notcp	X	2014
 ./bin/tests/system/legacy/ns5/plain-notcp.db	ZONE	2014,2016
 ./bin/tests/system/legacy/ns6/edns512.db.in	ZONE	2014,2016
 ./bin/tests/system/legacy/ns6/edns512.db.signed	X	2014
 ./bin/tests/system/legacy/ns6/named.args	X	2014
-./bin/tests/system/legacy/ns6/named.conf	CONF-C	2014,2016
-./bin/tests/system/legacy/ns6/sign.sh		SH	2014,2016
+./bin/tests/system/legacy/ns6/named.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/legacy/ns6/sign.sh		SH	2014,2016,2018
 ./bin/tests/system/legacy/ns7/edns512-notcp.db.in	ZONE	2014,2016
 ./bin/tests/system/legacy/ns7/edns512-notcp.db.signed	X	2014
 ./bin/tests/system/legacy/ns7/named.args	X	2014
-./bin/tests/system/legacy/ns7/named.conf	CONF-C	2014,2016
+./bin/tests/system/legacy/ns7/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/legacy/ns7/named.notcp	X	2014
-./bin/tests/system/legacy/ns7/sign.sh		SH	2014,2016
-./bin/tests/system/legacy/setup.sh		SH	2014,2016
-./bin/tests/system/legacy/tests.sh		SH	2014,2015,2016
-./bin/tests/system/limits/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016
+./bin/tests/system/legacy/ns7/sign.sh		SH	2014,2016,2018
+./bin/tests/system/legacy/setup.sh		SH	2014,2016,2018
+./bin/tests/system/legacy/tests.sh		SH	2014,2015,2016,2018
+./bin/tests/system/limits/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/limits/knowngood.dig.out.1000	X	2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.2000	X	2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.3000	X	2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.4000	X	2000,2001
 ./bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset	X	2000,2001
 ./bin/tests/system/limits/ns1/example.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/limits/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016,2017
+./bin/tests/system/limits/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/limits/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/limits/tests.sh		SH	2000,2001,2004,2007,2011,2012,2016
-./bin/tests/system/logfileconfig/clean.sh	SH	2011,2012,2014,2015,2016,2017
-./bin/tests/system/logfileconfig/ns1/named.dirconf	CONF-C	2011,2013,2016
-./bin/tests/system/logfileconfig/ns1/named.iso8601	CONF-C	2016
-./bin/tests/system/logfileconfig/ns1/named.iso8601-utc	CONF-C	2016
-./bin/tests/system/logfileconfig/ns1/named.pipeconf	CONF-C	2011,2013,2016
-./bin/tests/system/logfileconfig/ns1/named.plain	CONF-C	2011,2013,2014,2016
-./bin/tests/system/logfileconfig/ns1/named.plainconf	CONF-C	2014,2016
-./bin/tests/system/logfileconfig/ns1/named.symconf	CONF-C	2011,2013,2016
-./bin/tests/system/logfileconfig/ns1/named.tsconf	CONF-C	2017
-./bin/tests/system/logfileconfig/ns1/named.unlimited	CONF-C	2016
-./bin/tests/system/logfileconfig/ns1/named.versconf	CONF-C	2016
-./bin/tests/system/logfileconfig/ns1/rndc.conf	CONF-C	2011,2013,2016,2017
+./bin/tests/system/limits/setup.sh		SH	2018
+./bin/tests/system/limits/tests.sh		SH	2000,2001,2004,2007,2011,2012,2016,2018
+./bin/tests/system/logfileconfig/clean.sh	SH	2011,2012,2014,2015,2016,2017,2018
+./bin/tests/system/logfileconfig/ns1/controls.conf.in	CONF-C	2018
+./bin/tests/system/logfileconfig/ns1/named.dirconf	CONF-C	2011,2013,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.iso8601	CONF-C	2016,2018
+./bin/tests/system/logfileconfig/ns1/named.iso8601-utc	CONF-C	2016,2018
+./bin/tests/system/logfileconfig/ns1/named.pipeconf	CONF-C	2011,2013,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.plain	CONF-C	2011,2013,2014,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.plainconf	CONF-C	2014,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.symconf	CONF-C	2011,2013,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.tsconf	CONF-C	2017,2018
+./bin/tests/system/logfileconfig/ns1/named.unlimited	CONF-C	2016,2018
+./bin/tests/system/logfileconfig/ns1/named.versconf	CONF-C	2016,2018
+./bin/tests/system/logfileconfig/ns1/rndc.conf.in	CONF-C	2011,2013,2016,2017,2018
 ./bin/tests/system/logfileconfig/ns1/root.db	ZONE	2011,2016
-./bin/tests/system/logfileconfig/setup.sh	SH	2011,2012,2014,2016
-./bin/tests/system/logfileconfig/tests.sh	SH	2011,2012,2013,2014,2016,2017
-./bin/tests/system/masterfile/clean.sh		SH	2001,2004,2007,2010,2012,2014,2015,2016
+./bin/tests/system/logfileconfig/setup.sh	SH	2011,2012,2014,2016,2018
+./bin/tests/system/logfileconfig/tests.sh	SH	2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/masterfile/clean.sh		SH	2001,2004,2007,2010,2012,2014,2015,2016,2018
 ./bin/tests/system/masterfile/knowngood.dig.out	X	2001,2004,2012
 ./bin/tests/system/masterfile/ns1/include.db	ZONE	2001,2004,2007,2012,2016
-./bin/tests/system/masterfile/ns1/named.conf	CONF-C	2001,2004,2007,2016
+./bin/tests/system/masterfile/ns1/named.conf.in	CONF-C	2001,2004,2007,2016,2018
 ./bin/tests/system/masterfile/ns1/sub.db	ZONE	2001,2004,2007,2016
 ./bin/tests/system/masterfile/ns1/ttl1.db	ZONE	2001,2004,2007,2016
 ./bin/tests/system/masterfile/ns1/ttl2.db	ZONE	2001,2004,2007,2016
 ./bin/tests/system/masterfile/ns2/example.db	ZONE	2010,2016
-./bin/tests/system/masterfile/ns2/named.conf	CONF-C	2010,2016
-./bin/tests/system/masterfile/tests.sh		SH	2001,2004,2007,2010,2012,2015,2016
+./bin/tests/system/masterfile/ns2/named.conf.in	CONF-C	2010,2016,2018
+./bin/tests/system/masterfile/setup.sh		SH	2018
+./bin/tests/system/masterfile/tests.sh		SH	2001,2004,2007,2010,2012,2015,2016,2018
 ./bin/tests/system/masterfile/zone/inheritownerafterinclude.db	ZONE	2015,2016
 ./bin/tests/system/masterfile/zone/inheritownerafterinclude.good	X	2015
 ./bin/tests/system/masterfile/zone/nameservers.db	ZONE	2015,2016
-./bin/tests/system/masterformat/clean.sh	SH	2005,2007,2011,2012,2013,2014,2015,2016
+./bin/tests/system/masterformat/clean.sh	SH	2005,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/masterformat/ns1/compile.sh	SH	2005,2006,2007,2011,2012,2013,2014,2016,2017
 ./bin/tests/system/masterformat/ns1/example.db	ZONE	2005,2007,2014,2016
 ./bin/tests/system/masterformat/ns1/large.db.in	ZONE	2012,2016
-./bin/tests/system/masterformat/ns1/named.conf	CONF-C	2005,2007,2011,2012,2013,2014,2016
+./bin/tests/system/masterformat/ns1/named.conf.in	CONF-C	2005,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/masterformat/ns1/signed.db	ZONE	2013,2016
 ./bin/tests/system/masterformat/ns2/formerly-text.db.in	ZONE	2011,2016
-./bin/tests/system/masterformat/ns2/named.conf	CONF-C	2005,2007,2011,2012,2014,2016
-./bin/tests/system/masterformat/ns3/named.conf	CONF-C	2012,2013,2016
+./bin/tests/system/masterformat/ns2/named.conf.in	CONF-C	2005,2007,2011,2012,2014,2016,2018
+./bin/tests/system/masterformat/ns3/named.conf.in	CONF-C	2012,2013,2016,2018
 ./bin/tests/system/masterformat/prereq.sh	SH	2014,2016
-./bin/tests/system/masterformat/setup.sh	SH	2005,2006,2007,2011,2012,2013,2014,2016,2017
-./bin/tests/system/masterformat/tests.sh	SH	2005,2007,2011,2012,2013,2014,2016,2017
+./bin/tests/system/masterformat/setup.sh	SH	2005,2006,2007,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/masterformat/tests.sh	SH	2005,2007,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/metadata/child.db		ZONE	2009,2016
 ./bin/tests/system/metadata/clean.sh		SH	2009,2011,2012,2014,2016,2017
 ./bin/tests/system/metadata/parent.db		ZONE	2009,2016
 ./bin/tests/system/metadata/prereq.sh		SH	2009,2012,2014,2016
-./bin/tests/system/metadata/setup.sh		SH	2009,2011,2012,2014,2016,2017
-./bin/tests/system/metadata/tests.sh		SH	2009,2011,2012,2013,2014,2016,2017
+./bin/tests/system/metadata/setup.sh		SH	2009,2011,2012,2014,2016,2017,2018
+./bin/tests/system/metadata/tests.sh		SH	2009,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/mkeys/README			TXT.BRIEF	2015,2016,2017
-./bin/tests/system/mkeys/clean.sh		SH	2015,2016,2017
-./bin/tests/system/mkeys/ns1/named1.conf	CONF-C	2015,2016,2017
-./bin/tests/system/mkeys/ns1/named2.conf	CONF-C	2015,2016,2017
-./bin/tests/system/mkeys/ns1/named3.conf	CONF-C	2017
+./bin/tests/system/mkeys/clean.sh		SH	2015,2016,2017,2018
+./bin/tests/system/mkeys/ns1/named1.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/mkeys/ns1/named2.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/mkeys/ns1/named3.conf.in	CONF-C	2017,2018
 ./bin/tests/system/mkeys/ns1/root.db		ZONE	2015,2016,2017
 ./bin/tests/system/mkeys/ns1/sign.sh		SH	2015,2016,2017
 ./bin/tests/system/mkeys/ns2/named.args		X	2015,2016,2017
-./bin/tests/system/mkeys/ns2/named.conf		CONF-C	2015,2016
+./bin/tests/system/mkeys/ns2/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/mkeys/ns3/named.args		X	2015,2016,2017
-./bin/tests/system/mkeys/ns3/named.conf		CONF-C	2015,2016,2017
-./bin/tests/system/mkeys/ns4/named.conf		CONF-C	2017
-./bin/tests/system/mkeys/ns5/named.conf		CONF-C	2017
+./bin/tests/system/mkeys/ns3/named.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/mkeys/ns4/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/mkeys/ns5/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/mkeys/ns5/named1.args	X	2017
 ./bin/tests/system/mkeys/ns5/named2.args	X	2017
 ./bin/tests/system/mkeys/prereq.sh		SH	2015,2016
-./bin/tests/system/mkeys/setup.sh		SH	2015,2016,2017
-./bin/tests/system/mkeys/tests.sh		SH	2015,2016,2017
-./bin/tests/system/names/clean.sh		SH	2015,2016
+./bin/tests/system/mkeys/setup.sh		SH	2015,2016,2017,2018
+./bin/tests/system/mkeys/tests.sh		SH	2015,2016,2017,2018
+./bin/tests/system/names/clean.sh		SH	2015,2016,2018
 ./bin/tests/system/names/ns1/example.db		ZONE	2015,2016
-./bin/tests/system/names/ns1/named.conf		CONF-C	2015,2016
-./bin/tests/system/names/setup.sh		SH	2015,2016
-./bin/tests/system/names/tests.sh		SH	2015,2016
-./bin/tests/system/notify/clean.sh		SH	2000,2001,2004,2007,2011,2012,2014,2015,2016
-./bin/tests/system/notify/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016
+./bin/tests/system/names/ns1/named.conf.in	CONF-C	2015,2016,2018
+./bin/tests/system/names/setup.sh		SH	2015,2016,2018
+./bin/tests/system/names/tests.sh		SH	2015,2016,2018
+./bin/tests/system/notify/clean.sh		SH	2000,2001,2004,2007,2011,2012,2014,2015,2016,2018
+./bin/tests/system/notify/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/notify/ns1/root.db		ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/notify/ns2/example1.db	ZONE	2000,2001,2002,2004,2007,2009,2016
 ./bin/tests/system/notify/ns2/example2.db	ZONE	2000,2001,2002,2004,2007,2009,2016
 ./bin/tests/system/notify/ns2/example3.db	ZONE	2000,2001,2002,2004,2007,2009,2016
 ./bin/tests/system/notify/ns2/example4.db	ZONE	2000,2001,2002,2004,2007,2009,2016
 ./bin/tests/system/notify/ns2/generic.db	ZONE	2014,2016
-./bin/tests/system/notify/ns2/named.conf	CONF-C	2000,2001,2004,2007,2011,2014,2016
-./bin/tests/system/notify/ns3/named.conf	CONF-C	2000,2001,2004,2007,2016,2017
-./bin/tests/system/notify/ns4/named.conf	CONF-C	2014,2016,2017
-./bin/tests/system/notify/ns4/named.port	X	2014
-./bin/tests/system/notify/ns5/named.conf	CONF-C	2015,2016,2017
+./bin/tests/system/notify/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2014,2016,2018
+./bin/tests/system/notify/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
+./bin/tests/system/notify/ns4/named.conf.in	CONF-C	2014,2016,2017,2018
+./bin/tests/system/notify/ns4/named.port.in	X	2014,2018
+./bin/tests/system/notify/ns5/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/notify/ns5/x21.db		ZONE	2015,2016
-./bin/tests/system/notify/setup.sh		SH	2000,2001,2004,2007,2012,2014,2016
-./bin/tests/system/notify/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2015,2016
-./bin/tests/system/nslookup/clean.sh		SH	2014,2015,2016
+./bin/tests/system/notify/setup.sh		SH	2000,2001,2004,2007,2012,2014,2016,2018
+./bin/tests/system/notify/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/nslookup/clean.sh		SH	2014,2015,2016,2018
 ./bin/tests/system/nslookup/ns1/example.net.db	ZONE	2016
-./bin/tests/system/nslookup/ns1/named.conf	CONF-C	2014,2016
-./bin/tests/system/nslookup/setup.sh		SH	2014,2016
-./bin/tests/system/nslookup/tests.sh		SH	2014,2016
-./bin/tests/system/nsupdate/ans4/ans.pl		PERL	2017
-./bin/tests/system/nsupdate/clean.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014,2015,2016,2017
+./bin/tests/system/nslookup/ns1/named.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/nslookup/setup.sh		SH	2014,2016,2018
+./bin/tests/system/nslookup/tests.sh		SH	2014,2016,2018
+./bin/tests/system/nsupdate/ans4/ans.pl		PERL	2017,2018
+./bin/tests/system/nsupdate/clean.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/nsupdate/commandlist		X	2012
 ./bin/tests/system/nsupdate/knowngood.ns1.after	X	2000,2001,2003,2004,2009
 ./bin/tests/system/nsupdate/knowngood.ns1.afterstop	X	2001,2004
@@ -1808,77 +1827,77 @@
 ./bin/tests/system/nsupdate/ns1/many.test.db.in	ZONE	2014,2016,2017
 ./bin/tests/system/nsupdate/ns1/max-ttl.db	ZONE	2014,2016
 ./bin/tests/system/nsupdate/ns1/maxjournal.db.in	ZONE	2017
-./bin/tests/system/nsupdate/ns1/named.conf	CONF-C	2000,2001,2004,2005,2007,2009,2011,2012,2013,2014,2016,2017
+./bin/tests/system/nsupdate/ns1/named.conf.in	CONF-C	2000,2001,2004,2005,2007,2009,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/nsupdate/ns1/sample.db.in	ZONE	2016
-./bin/tests/system/nsupdate/ns2/named.conf	CONF-C	2000,2001,2004,2007,2011,2013,2016,2017
+./bin/tests/system/nsupdate/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2013,2016,2017,2018
 ./bin/tests/system/nsupdate/ns2/sample.db.in	ZONE	2016
 ./bin/tests/system/nsupdate/ns3/delegation.test.db.in	ZONE	2016
 ./bin/tests/system/nsupdate/ns3/dnskey.test.db.in	ZONE	2011,2016
 ./bin/tests/system/nsupdate/ns3/example.db.in	ZONE	2010,2016
-./bin/tests/system/nsupdate/ns3/named.conf	CONF-C	2010,2011,2013,2014,2016
+./bin/tests/system/nsupdate/ns3/named.conf.in	CONF-C	2010,2011,2013,2014,2016,2018
 ./bin/tests/system/nsupdate/ns3/nsec3param.test.db.in	ZONE	2010,2016
 ./bin/tests/system/nsupdate/ns3/sign.sh		SH	2010,2011,2012,2014,2016,2017
 ./bin/tests/system/nsupdate/ns3/too-big.test.db.in	ZONE	2016
 ./bin/tests/system/nsupdate/ns5/local.db.in	ZONE	2017
 ./bin/tests/system/nsupdate/ns5/named.args	X	2017
-./bin/tests/system/nsupdate/ns5/named.conf	CONF-C	2017
-./bin/tests/system/nsupdate/prereq.sh		SH	2014,2015,2016
-./bin/tests/system/nsupdate/setup.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014,2016,2017
+./bin/tests/system/nsupdate/ns5/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/nsupdate/prereq.sh		SH	2014,2015,2016,2018
+./bin/tests/system/nsupdate/setup.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/nsupdate/tests.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/nsupdate/update_test.pl	PERL	2000,2001,2004,2007,2012,2016
-./bin/tests/system/nsupdate/verylarge		X	2013
-./bin/tests/system/nzd2nzf/clean.sh		SH	2016
+./bin/tests/system/nsupdate/update_test.pl	PERL	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/nsupdate/verylarge.in	X	2013,2018
+./bin/tests/system/nzd2nzf/clean.sh		SH	2016,2018
 ./bin/tests/system/nzd2nzf/ns1/added.db		ZONE	2016
-./bin/tests/system/nzd2nzf/ns1/named.conf	CONF-C	2016
-./bin/tests/system/nzd2nzf/prereq.sh		SH	2016
-./bin/tests/system/nzd2nzf/setup.sh		SH	2016
-./bin/tests/system/nzd2nzf/tests.sh		SH	2016
+./bin/tests/system/nzd2nzf/ns1/named.conf.in	CONF-C	2016,2018
+./bin/tests/system/nzd2nzf/prereq.sh		SH	2016,2018
+./bin/tests/system/nzd2nzf/setup.sh		SH	2016,2018
+./bin/tests/system/nzd2nzf/tests.sh		SH	2016,2018
 ./bin/tests/system/org.isc.bind.system		SH	2010,2012,2013,2016
 ./bin/tests/system/org.isc.bind.system.plist	X	2010
 ./bin/tests/system/packet.pl			PERL	2011,2012,2016
-./bin/tests/system/padding/clean.sh		SH	2017
-./bin/tests/system/padding/ns1/named.conf	CONF-C	2017
+./bin/tests/system/padding/clean.sh		SH	2017,2018
+./bin/tests/system/padding/ns1/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/padding/ns1/root.db		ZONE	2017
 ./bin/tests/system/padding/ns2/example.db	ZONE	2017
-./bin/tests/system/padding/ns2/named.conf	CONF-C	2017
-./bin/tests/system/padding/ns3/named.conf	CONF-C	2017
-./bin/tests/system/padding/ns4/named.conf	CONF-C	2017
-./bin/tests/system/padding/setup.sh		SH	2017
-./bin/tests/system/padding/tests.sh		SH	2017
-./bin/tests/system/pending/clean.sh		SH	2009,2012,2014,2016
-./bin/tests/system/pending/ns1/named.conf	CONF-C	2009,2016
+./bin/tests/system/padding/ns2/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/padding/ns3/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/padding/ns4/named.conf.in	CONF-C	2017,2018
+./bin/tests/system/padding/setup.sh		SH	2017,2018
+./bin/tests/system/padding/tests.sh		SH	2017,2018
+./bin/tests/system/pending/clean.sh		SH	2009,2012,2014,2016,2018
+./bin/tests/system/pending/ns1/named.conf.in	CONF-C	2009,2016,2018
 ./bin/tests/system/pending/ns1/root.db.in	ZONE	2009,2010,2016
 ./bin/tests/system/pending/ns1/sign.sh		SH	2009,2010,2012,2014,2016
 ./bin/tests/system/pending/ns2/example.com.db.in	ZONE	2009,2010,2016
 ./bin/tests/system/pending/ns2/example.db.in	ZONE	2009,2010,2016
 ./bin/tests/system/pending/ns2/forgery.db	ZONE	2010,2016
-./bin/tests/system/pending/ns2/named.conf	CONF-C	2009,2010,2016
+./bin/tests/system/pending/ns2/named.conf.in	CONF-C	2009,2010,2016,2018
 ./bin/tests/system/pending/ns2/sign.sh		SH	2009,2010,2012,2014,2016,2017
 ./bin/tests/system/pending/ns3/hostile.db	ZONE	2009,2016
 ./bin/tests/system/pending/ns3/mail.example.db	ZONE	2009,2016
-./bin/tests/system/pending/ns3/named.conf	CONF-C	2009,2016
-./bin/tests/system/pending/ns4/named.conf	CONF-C	2009,2016
+./bin/tests/system/pending/ns3/named.conf.in	CONF-C	2009,2016,2018
+./bin/tests/system/pending/ns4/named.conf.in	CONF-C	2009,2016,2018
 ./bin/tests/system/pending/prereq.sh		SH	2009,2012,2014,2016
-./bin/tests/system/pending/setup.sh		SH	2009,2012,2014,2016,2017
-./bin/tests/system/pending/tests.sh		SH	2009,2010,2012,2015,2016
+./bin/tests/system/pending/setup.sh		SH	2009,2012,2014,2016,2017,2018
+./bin/tests/system/pending/tests.sh		SH	2009,2010,2012,2015,2016,2018
 ./bin/tests/system/pipelined/.gitignore		X	2015
 ./bin/tests/system/pipelined/Makefile.in	MAKE	2014,2015,2016
-./bin/tests/system/pipelined/clean.sh		SH	2014,2015,2016
+./bin/tests/system/pipelined/clean.sh		SH	2014,2015,2016,2018
 ./bin/tests/system/pipelined/input		X	2014,2015
 ./bin/tests/system/pipelined/inputb		X	2014,2015
-./bin/tests/system/pipelined/ns1/named.conf	CONF-C	2014,2015,2016
+./bin/tests/system/pipelined/ns1/named.conf.in	CONF-C	2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns1/root.db	ZONE	2014,2015,2016
 ./bin/tests/system/pipelined/ns2/examplea.db	ZONE	2014,2015,2016
-./bin/tests/system/pipelined/ns2/named.conf	CONF-C	2014,2015,2016
+./bin/tests/system/pipelined/ns2/named.conf.in	CONF-C	2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns3/exampleb.db	ZONE	2014,2015,2016
 ./bin/tests/system/pipelined/ns3/named.args	X	2014,2015
-./bin/tests/system/pipelined/ns3/named.conf	CONF-C	2014,2015,2016
-./bin/tests/system/pipelined/ns4/named.conf	CONF-C	2014,2015,2016
-./bin/tests/system/pipelined/pipequeries.c	C	2014,2015,2015,2016,2017
+./bin/tests/system/pipelined/ns3/named.conf.in	CONF-C	2014,2015,2016,2018
+./bin/tests/system/pipelined/ns4/named.conf.in	CONF-C	2014,2015,2016,2018
+./bin/tests/system/pipelined/pipequeries.c	C	2014,2015,2015,2016,2017,2018
 ./bin/tests/system/pipelined/ref		X	2014,2015
 ./bin/tests/system/pipelined/refb		X	2014,2015
-./bin/tests/system/pipelined/setup.sh		SH	2014,2015,2016,2017
-./bin/tests/system/pipelined/tests.sh		SH	2014,2015,2016,2017
+./bin/tests/system/pipelined/setup.sh		SH	2014,2015,2016,2017,2018
+./bin/tests/system/pipelined/tests.sh		SH	2014,2015,2016,2017,2018
 ./bin/tests/system/pkcs11/clean.sh		SH	2010,2012,2014,2016,2017
 ./bin/tests/system/pkcs11/ns1/example.db.in	ZONE	2010,2016
 ./bin/tests/system/pkcs11/ns1/named.conf	CONF-C	2010,2013,2014,2016,2017
@@ -1894,21 +1913,21 @@
 ./bin/tests/system/pkcs11ssl/tests.sh		SH	2014,2016
 ./bin/tests/system/pkcs11ssl/usepkcs11		X	2014
 ./bin/tests/system/reclimit/README		TXT.BRIEF	2014,2016,2017
-./bin/tests/system/reclimit/ans2/ans.pl		PERL	2014,2015,2016,2017
-./bin/tests/system/reclimit/ans7/ans.pl		PERL	2014,2016
-./bin/tests/system/reclimit/clean.sh		SH	2014,2016
-./bin/tests/system/reclimit/ns1/named.conf	CONF-C	2014,2016
+./bin/tests/system/reclimit/ans2/ans.pl		PERL	2014,2015,2016,2017,2018
+./bin/tests/system/reclimit/ans7/ans.pl		PERL	2014,2016,2018
+./bin/tests/system/reclimit/clean.sh		SH	2014,2016,2018
+./bin/tests/system/reclimit/ns1/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/reclimit/ns1/root.db		ZONE	2014,2016,2017
 ./bin/tests/system/reclimit/ns3/.gitignore	X	2014
 ./bin/tests/system/reclimit/ns3/hints.db	ZONE	2014,2016
-./bin/tests/system/reclimit/ns3/named1.conf	CONF-C	2014,2016
-./bin/tests/system/reclimit/ns3/named2.conf	CONF-C	2014,2016
-./bin/tests/system/reclimit/ns3/named3.conf	CONF-C	2014,2016
-./bin/tests/system/reclimit/ns3/named4.conf	CONF-C	2014,2016
-./bin/tests/system/reclimit/prereq.sh		SH	2015,2016,2017
-./bin/tests/system/reclimit/setup.sh		SH	2014,2016
-./bin/tests/system/reclimit/tests.sh		SH	2014,2015,2016,2017
-./bin/tests/system/redirect/clean.sh		SH	2011,2012,2013,2014,2015,2016
+./bin/tests/system/reclimit/ns3/named1.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/reclimit/ns3/named2.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/reclimit/ns3/named3.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/reclimit/ns3/named4.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/reclimit/prereq.sh		SH	2015,2016,2017,2018
+./bin/tests/system/reclimit/setup.sh		SH	2014,2016,2018
+./bin/tests/system/reclimit/tests.sh		SH	2014,2015,2016,2017,2018
+./bin/tests/system/redirect/clean.sh		SH	2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/redirect/conf/bad1.conf	CONF-C	2011,2016
 ./bin/tests/system/redirect/conf/bad2.conf	CONF-C	2011,2016
 ./bin/tests/system/redirect/conf/bad3.conf	CONF-C	2011,2016
@@ -1917,41 +1936,41 @@
 ./bin/tests/system/redirect/conf/good3.conf	CONF-C	2011,2016
 ./bin/tests/system/redirect/conf/good4.conf	CONF-C	2011,2016
 ./bin/tests/system/redirect/ns1/example.db	ZONE	2011,2016
-./bin/tests/system/redirect/ns1/named.conf	CONF-C	2011,2016
+./bin/tests/system/redirect/ns1/named.conf.in	CONF-C	2011,2016,2018
 ./bin/tests/system/redirect/ns1/redirect.db	ZONE	2011,2016
 ./bin/tests/system/redirect/ns1/root.db		ZONE	2011,2016
 ./bin/tests/system/redirect/ns1/sign.sh		SH	2011,2012,2014,2016,2017
 ./bin/tests/system/redirect/ns2/example.db.in	ZONE	2013,2016
-./bin/tests/system/redirect/ns2/named.conf	CONF-C	2011,2013,2016
+./bin/tests/system/redirect/ns2/named.conf.in	CONF-C	2011,2013,2016,2018
 ./bin/tests/system/redirect/ns2/redirect.db.in	ZONE	2011.2013,2013,2016
 ./bin/tests/system/redirect/ns3/example.db	ZONE	2015,2016
-./bin/tests/system/redirect/ns3/named.conf	CONF-C	2015,2016
+./bin/tests/system/redirect/ns3/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/redirect/ns3/redirect.db	ZONE	2015,2016
 ./bin/tests/system/redirect/ns3/root.db		ZONE	2015,2016
 ./bin/tests/system/redirect/ns3/sign.sh		SH	2015,2016,2017
 ./bin/tests/system/redirect/ns4/example.db.in	ZONE	2015,2016
-./bin/tests/system/redirect/ns4/named.conf	CONF-C	2015,2016
+./bin/tests/system/redirect/ns4/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/redirect/ns4/root.hint	ZONE	2015,2016
 ./bin/tests/system/redirect/prereq.sh		SH	2014,2016
-./bin/tests/system/redirect/setup.sh		SH	2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/redirect/tests.sh		SH	2011,2012,2013,2014,2015,2016
-./bin/tests/system/resolver/ans2/ans.pl		PERL	2000,2001,2004,2007,2009,2010,2012,2016
-./bin/tests/system/resolver/ans3/ans.pl		PERL	2000,2001,2004,2007,2009,2012,2016
-./bin/tests/system/resolver/ans8/ans.pl		PERL	2017
-./bin/tests/system/resolver/clean.sh		SH	2008,2009,2010,2011,2012,2013,2014,2015,2016
-./bin/tests/system/resolver/ns1/named.conf	CONF-C	2000,2001,2004,2007,2009,2013,2014,2015,2016,2017
+./bin/tests/system/redirect/setup.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/redirect/tests.sh		SH	2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/resolver/ans2/ans.pl		PERL	2000,2001,2004,2007,2009,2010,2012,2016,2018
+./bin/tests/system/resolver/ans3/ans.pl		PERL	2000,2001,2004,2007,2009,2012,2016,2018
+./bin/tests/system/resolver/ans8/ans.pl		PERL	2017,2018
+./bin/tests/system/resolver/clean.sh		SH	2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/resolver/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2009,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/resolver/ns1/root.hint	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/resolver/ns4/broken.db	ZONE	2012,2016
 ./bin/tests/system/resolver/ns4/child.server.db	ZONE	2011,2016
 ./bin/tests/system/resolver/ns4/moves.db	ZONE	2011,2016
-./bin/tests/system/resolver/ns4/named.conf	CONF-C	2010,2011,2012,2013,2015,2016
+./bin/tests/system/resolver/ns4/named.conf.in	CONF-C	2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/resolver/ns4/named.noaa	TXT.BRIEF	2010,2016
 ./bin/tests/system/resolver/ns4/root.db		ZONE	2010,2014,2015,2016,2017
 ./bin/tests/system/resolver/ns4/tld1.db		ZONE	2012,2014,2016,2017
 ./bin/tests/system/resolver/ns4/tld2.db		ZONE	2012,2014,2016,2017
 ./bin/tests/system/resolver/ns5/child.server.db	ZONE	2011,2016
 ./bin/tests/system/resolver/ns5/moves.db	ZONE	2011,2016
-./bin/tests/system/resolver/ns5/named.conf	CONF-C	2010,2011,2013,2014,2015,2016
+./bin/tests/system/resolver/ns5/named.conf.in	CONF-C	2010,2011,2013,2014,2015,2016,2018
 ./bin/tests/system/resolver/ns5/root.hint	ZONE	2010,2016
 ./bin/tests/system/resolver/ns6/broken.db	ZONE	2012,2016
 ./bin/tests/system/resolver/ns6/delegation-only.db	ZONE	2015,2016
@@ -1960,87 +1979,87 @@
 ./bin/tests/system/resolver/ns6/fetch.tld.db	ZONE	2017
 ./bin/tests/system/resolver/ns6/keygen.sh	SH	2010,2012,2014,2016,2017
 ./bin/tests/system/resolver/ns6/moves.db	ZONE	2011,2016
-./bin/tests/system/resolver/ns6/named.conf	CONF-C	2010,2012,2013,2014,2015,2016,2017
+./bin/tests/system/resolver/ns6/named.conf.in	CONF-C	2010,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/resolver/ns6/no-edns-version.tld.db	ZONE	2014,2016
 ./bin/tests/system/resolver/ns6/root.db		ZONE	2010,2011,2014,2016
 ./bin/tests/system/resolver/ns6/to-be-removed.tld.db.in	ZONE	2012,2016
 ./bin/tests/system/resolver/ns7/all-cnames.db	ZONE	2014,2016
 ./bin/tests/system/resolver/ns7/edns-version.tld.db	ZONE	2014,2016
 ./bin/tests/system/resolver/ns7/named.args	X	2011,2012,2014
-./bin/tests/system/resolver/ns7/named1.conf	CONF-C	2010,2011,2013,2014,2016
-./bin/tests/system/resolver/ns7/named2.conf	CONF-C	2013,2014,2016
+./bin/tests/system/resolver/ns7/named1.conf.in	CONF-C	2010,2011,2013,2014,2016,2018
+./bin/tests/system/resolver/ns7/named2.conf.in	CONF-C	2013,2014,2016,2018
 ./bin/tests/system/resolver/ns7/root.hint	ZONE	2010,2016
 ./bin/tests/system/resolver/ns7/server.db.in	ZONE	2011,2016
-./bin/tests/system/resolver/prereq.sh		SH	2000,2001,2004,2007,2012,2014,2016
-./bin/tests/system/resolver/setup.sh		SH	2010,2011,2012,2013,2014,2016,2017
-./bin/tests/system/resolver/tests.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/resolver/prereq.sh		SH	2000,2001,2004,2007,2012,2014,2016,2018
+./bin/tests/system/resolver/setup.sh		SH	2010,2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/resolver/tests.sh		SH	2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rndc/.gitignore		X	2014
 ./bin/tests/system/rndc/Makefile.in		MAKE	2014,2015,2016,2017
-./bin/tests/system/rndc/clean.sh		SH	2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/rndc/clean.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rndc/gencheck.c		C	2014,2015,2016
 ./bin/tests/system/rndc/ns2/incl.db		ZONE	2013,2016
-./bin/tests/system/rndc/ns2/named.conf		CONF-C	2011,2012,2013,2016
+./bin/tests/system/rndc/ns2/named.conf.in	CONF-C	2011,2012,2013,2016,2018
 ./bin/tests/system/rndc/ns2/secondkey.conf	CONF-C	2012,2013,2016
-./bin/tests/system/rndc/ns3/named.conf		CONF-C	2012,2013,2015,2016
+./bin/tests/system/rndc/ns3/named.conf.in	CONF-C	2012,2013,2015,2016,2018
 ./bin/tests/system/rndc/ns4/.gitignore		X	2016
-./bin/tests/system/rndc/ns4/named.conf.in	CONF-C	2013,2014,2015,2016
-./bin/tests/system/rndc/ns5/named.conf		CONF-C	2015,2016
+./bin/tests/system/rndc/ns4/named.conf.in	CONF-C	2013,2014,2015,2016,2018
+./bin/tests/system/rndc/ns5/named.conf.in	CONF-C	2015,2016,2018
 ./bin/tests/system/rndc/ns6/named.args		X	2016
-./bin/tests/system/rndc/ns6/named.conf.in	CONF-C	2016
-./bin/tests/system/rndc/setup.sh		SH	2011,2012,2013,2014,2016,2017
+./bin/tests/system/rndc/ns6/named.conf.in	CONF-C	2016,2018
+./bin/tests/system/rndc/setup.sh		SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rndc/tests.sh		SH	2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rpz/.gitignore		X	2017
 ./bin/tests/system/rpz/Makefile.in		MAKE	2017
 ./bin/tests/system/rpz/ckdnsrps.sh		SH	2017
-./bin/tests/system/rpz/clean.sh			SH	2011,2012,2013,2014,2016,2017
+./bin/tests/system/rpz/clean.sh			SH	2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/dnsrps.c			C	2017,2018
 ./bin/tests/system/rpz/dnsrpzd-license.conf	X	2017
-./bin/tests/system/rpz/dnsrpzd.conf		CONF-C	2017
-./bin/tests/system/rpz/ns1/named.conf		CONF-C	2011,2013,2016,2017
+./bin/tests/system/rpz/dnsrpzd.conf.in		CONF-C	2017,2018
+./bin/tests/system/rpz/ns1/named.conf.in	CONF-C	2011,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns1/root.db		ZONE	2011,2012,2013,2016
 ./bin/tests/system/rpz/ns2/base-tld2s.db	ZONE	2012,2013,2016
 ./bin/tests/system/rpz/ns2/bl.tld2.db.in	ZONE	2013,2016
 ./bin/tests/system/rpz/ns2/blv2.tld2.db.in	ZONE	2013,2016
 ./bin/tests/system/rpz/ns2/blv3.tld2.db.in	ZONE	2013,2016
 ./bin/tests/system/rpz/ns2/hints		ZONE	2011,2013,2016
-./bin/tests/system/rpz/ns2/named.conf		CONF-C	2011,2012,2013,2016,2017
+./bin/tests/system/rpz/ns2/named.conf.in	CONF-C	2011,2012,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns2/tld2.db		ZONE	2011,2012,2013,2016
 ./bin/tests/system/rpz/ns3/base.db		ZONE	2011,2012,2013,2016,2017
 ./bin/tests/system/rpz/ns3/crash1		X	2011,2013
 ./bin/tests/system/rpz/ns3/crash2		X	2011,2012,2013
 ./bin/tests/system/rpz/ns3/hints		ZONE	2011,2013,2016
-./bin/tests/system/rpz/ns3/named.conf		CONF-C	2011,2012,2013,2016,2017
+./bin/tests/system/rpz/ns3/named.conf.in	CONF-C	2011,2012,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns4/hints		ZONE	2011,2013,2016
-./bin/tests/system/rpz/ns4/named.conf		CONF-C	2011,2012,2013,2016,2017
+./bin/tests/system/rpz/ns4/named.conf.in	CONF-C	2011,2012,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns4/tld4.db		ZONE	2011,2012,2013,2016
 ./bin/tests/system/rpz/ns5/empty.db.in		ZONE	2014,2016
 ./bin/tests/system/rpz/ns5/hints		ZONE	2011,2012,2013,2016
 ./bin/tests/system/rpz/ns5/named.args		X	2013,2014
-./bin/tests/system/rpz/ns5/named.conf		CONF-C	2012,2013,2014,2016,2017
+./bin/tests/system/rpz/ns5/named.conf.in	CONF-C	2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/ns5/tld5.db		ZONE	2013,2016,2017
 ./bin/tests/system/rpz/ns6/hints		ZONE	2014,2016
-./bin/tests/system/rpz/ns6/named.conf		CONF-C	2014,2016,2017
+./bin/tests/system/rpz/ns6/named.conf.in	CONF-C	2014,2016,2017,2018
 ./bin/tests/system/rpz/ns7/hints		ZONE	2014,2016
-./bin/tests/system/rpz/ns7/named.conf		CONF-C	2014,2016,2017
+./bin/tests/system/rpz/ns7/named.conf.in	CONF-C	2014,2016,2017,2018
 ./bin/tests/system/rpz/prereq.sh		SH	2014,2016
 ./bin/tests/system/rpz/qperf.sh			SH	2012,2013,2016
-./bin/tests/system/rpz/setup.sh			SH	2011,2012,2013,2014,2016,2017
-./bin/tests/system/rpz/test1			ZONE	2011,2012,2013,2016
-./bin/tests/system/rpz/test2			ZONE	2011,2012,2013,2016
-./bin/tests/system/rpz/test3			ZONE	2011,2013,2016,2017
-./bin/tests/system/rpz/test4			ZONE	2011,2013,2016,2017
-./bin/tests/system/rpz/test4a			ZONE	2013,2016
-./bin/tests/system/rpz/test5			ZONE	2011,2012,2013,2016
-./bin/tests/system/rpz/test6			ZONE	2013,2016
-./bin/tests/system/rpz/tests.sh			SH	2011,2012,2013,2014,2015,2016,2017
-./bin/tests/system/rpzrecurse/.gitignore	X	2015
+./bin/tests/system/rpz/setup.sh			SH	2011,2012,2013,2014,2016,2017,2018
+./bin/tests/system/rpz/test1			ZONE	2011,2012,2013,2016,2018
+./bin/tests/system/rpz/test2			ZONE	2011,2012,2013,2016,2018
+./bin/tests/system/rpz/test3			ZONE	2011,2013,2016,2017,2018
+./bin/tests/system/rpz/test4			ZONE	2011,2013,2016,2017,2018
+./bin/tests/system/rpz/test4a			ZONE	2013,2016,2018
+./bin/tests/system/rpz/test5			ZONE	2011,2012,2013,2016,2018
+./bin/tests/system/rpz/test6			ZONE	2013,2016,2018
+./bin/tests/system/rpz/tests.sh			SH	2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/.gitignore	X	2015,2018
 ./bin/tests/system/rpzrecurse/README		TXT.BRIEF	2015,2016
-./bin/tests/system/rpzrecurse/ans5/ans.pl	PERL	2016
+./bin/tests/system/rpzrecurse/ans5/ans.pl	PERL	2016,2018
 ./bin/tests/system/rpzrecurse/clean.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns1/db.l0		ZONE	2015,2016
 ./bin/tests/system/rpzrecurse/ns1/db.l1.l0	ZONE	2015,2016
 ./bin/tests/system/rpzrecurse/ns1/example.db	ZONE	2015,2016
-./bin/tests/system/rpzrecurse/ns1/named.conf	CONF-C	2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/ns1/named.conf.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns1/root.db	ZONE	2015,2016
 ./bin/tests/system/rpzrecurse/ns1/test1.example.net.db	ZONE	2015,2016
 ./bin/tests/system/rpzrecurse/ns1/test2.example.net.db	ZONE	2015,2016
@@ -2057,7 +2076,7 @@
 ./bin/tests/system/rpzrecurse/ns2/db.wildcard3	ZONE	2015,2016
 ./bin/tests/system/rpzrecurse/ns2/named.clientip.conf	CONF-C	2015,2016,2017
 ./bin/tests/system/rpzrecurse/ns2/named.clientip2.conf	CONF-C	2016,2017
-./bin/tests/system/rpzrecurse/ns2/named.conf.header	CONF-C	2015,2016,2017
+./bin/tests/system/rpzrecurse/ns2/named.conf.header.in	CONF-C	2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns2/named.default.conf	CONF-C	2015,2016
 ./bin/tests/system/rpzrecurse/ns2/named.log.conf	CONF-C	2015,2016,2017
 ./bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf	CONF-C	2015,2016,2017
@@ -2065,12 +2084,12 @@
 ./bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf	CONF-C	2015,2016,2017
 ./bin/tests/system/rpzrecurse/ns2/root.hint	ZONE	2015,2016
 ./bin/tests/system/rpzrecurse/ns3/example.db	ZONE	2016
-./bin/tests/system/rpzrecurse/ns3/named1.conf	CONF-C	2016,2017
-./bin/tests/system/rpzrecurse/ns3/named2.conf	CONF-C	2016,2017
+./bin/tests/system/rpzrecurse/ns3/named1.conf.in	CONF-C	2016,2017,2018
+./bin/tests/system/rpzrecurse/ns3/named2.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns3/policy.db	ZONE	2016
 ./bin/tests/system/rpzrecurse/ns3/root.db	ZONE	2016
 ./bin/tests/system/rpzrecurse/ns4/child.example.db	ZONE	2016
-./bin/tests/system/rpzrecurse/ns4/named.conf	CONF-C	2016,2017
+./bin/tests/system/rpzrecurse/ns4/named.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/rpzrecurse/prereq.sh		SH	2015,2016,2017
 ./bin/tests/system/rpzrecurse/setup.sh		SH	2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/testgen.pl	PERL	2015,2016,2017
@@ -2078,25 +2097,25 @@
 ./bin/tests/system/rrchecker/classlist.good	X	2013
 ./bin/tests/system/rrchecker/clean.sh		SH	2013,2014,2016,2017
 ./bin/tests/system/rrchecker/privatelist.good	X	2013
-./bin/tests/system/rrchecker/tests.sh		SH	2013,2014,2015,2016,2017
+./bin/tests/system/rrchecker/tests.sh		SH	2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rrchecker/typelist.good	X	2013,2014,2015,2016,2017
 ./bin/tests/system/rrl/.gitignore		X	2013,2014
 ./bin/tests/system/rrl/broken.conf		CONF-C	2016,2017
-./bin/tests/system/rrl/clean.sh			SH	2012,2013,2014,2016
-./bin/tests/system/rrl/ns1/named.conf		CONF-C	2012,2013,2016
+./bin/tests/system/rrl/clean.sh			SH	2012,2013,2014,2016,2018
+./bin/tests/system/rrl/ns1/named.conf.in	CONF-C	2012,2013,2016,2018
 ./bin/tests/system/rrl/ns1/root.db		ZONE	2012,2013,2016
 ./bin/tests/system/rrl/ns2/hints		ZONE	2012,2013,2016
-./bin/tests/system/rrl/ns2/named.conf		CONF-C	2012,2013,2016,2017
+./bin/tests/system/rrl/ns2/named.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/rrl/ns2/tld2.db		ZONE	2012,2013,2016
 ./bin/tests/system/rrl/ns3/hints		ZONE	2012,2013,2016
-./bin/tests/system/rrl/ns3/named.conf		CONF-C	2012,2013,2016
+./bin/tests/system/rrl/ns3/named.conf.in	CONF-C	2012,2013,2016,2018
 ./bin/tests/system/rrl/ns3/tld3.db		ZONE	2012,2013,2016
 ./bin/tests/system/rrl/ns4/hints		ZONE	2016
-./bin/tests/system/rrl/ns4/named.conf		CONF-C	2016,2017
+./bin/tests/system/rrl/ns4/named.conf.in	CONF-C	2016,2017,2018
 ./bin/tests/system/rrl/ns4/tld4.db		ZONE	2016
-./bin/tests/system/rrl/setup.sh			SH	2012,2013,2016
-./bin/tests/system/rrl/tests.sh			SH	2012,2013,2015,2016
-./bin/tests/system/rrsetorder/clean.sh		SH	2006,2007,2008,2011,2012,2014,2016,2017
+./bin/tests/system/rrl/setup.sh			SH	2012,2013,2016,2018
+./bin/tests/system/rrl/tests.sh			SH	2012,2013,2015,2016,2018
+./bin/tests/system/rrsetorder/clean.sh		SH	2006,2007,2008,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/rrsetorder/dig.out.fixed.good	X	2006
 ./bin/tests/system/rrsetorder/dig.out.random.good1	X	2006
 ./bin/tests/system/rrsetorder/dig.out.random.good10	X	2006
@@ -2122,23 +2141,24 @@
 ./bin/tests/system/rrsetorder/dig.out.random.good7	X	2006
 ./bin/tests/system/rrsetorder/dig.out.random.good8	X	2006
 ./bin/tests/system/rrsetorder/dig.out.random.good9	X	2006
-./bin/tests/system/rrsetorder/ns1/named.conf	CONF-C	2006,2007,2013,2016
+./bin/tests/system/rrsetorder/ns1/named.conf.in	CONF-C	2006,2007,2013,2016,2018
 ./bin/tests/system/rrsetorder/ns1/root.db	ZONE	2006,2007,2012,2016,2017
-./bin/tests/system/rrsetorder/ns2/named.conf	CONF-C	2006,2007,2016
-./bin/tests/system/rrsetorder/ns3/named.conf	CONF-C	2006,2007,2016,2017
-./bin/tests/system/rrsetorder/ns4/named.conf	CONF-C	2015,2016,2017
-./bin/tests/system/rrsetorder/tests.sh		SH	2006,2007,2008,2011,2012,2014,2015,2016,2017
+./bin/tests/system/rrsetorder/ns2/named.conf.in	CONF-C	2006,2007,2016,2018
+./bin/tests/system/rrsetorder/ns3/named.conf.in	CONF-C	2006,2007,2016,2017,2018
+./bin/tests/system/rrsetorder/ns4/named.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/rrsetorder/setup.sh		SH	2018
+./bin/tests/system/rrsetorder/tests.sh		SH	2006,2007,2008,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/rsabigexponent/.gitignore	X	2013
 ./bin/tests/system/rsabigexponent/Makefile.in	MAKE	2012,2014,2015,2016,2017
 ./bin/tests/system/rsabigexponent/bigkey.c	C	2012,2014,2015,2016,2017
-./bin/tests/system/rsabigexponent/clean.sh	SH	2012,2014,2016
+./bin/tests/system/rsabigexponent/clean.sh	SH	2012,2014,2016,2018
 ./bin/tests/system/rsabigexponent/conf/bad01.conf	CONF-C	2012,2016
 ./bin/tests/system/rsabigexponent/conf/bad02.conf	CONF-C	2012,2016
 ./bin/tests/system/rsabigexponent/conf/bad03.conf	CONF-C	2012,2016
 ./bin/tests/system/rsabigexponent/conf/good01.conf	CONF-C	2012,2016
 ./bin/tests/system/rsabigexponent/conf/good02.conf	CONF-C	2012,2016
 ./bin/tests/system/rsabigexponent/conf/good03.conf	CONF-C	2012,2016
-./bin/tests/system/rsabigexponent/ns1/named.conf	CONF-C	2012,2016
+./bin/tests/system/rsabigexponent/ns1/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns1/root.db.in	ZONE	2012,2016
 ./bin/tests/system/rsabigexponent/ns1/sign.sh	SH	2012,2014,2016
 ./bin/tests/system/rsabigexponent/ns2/Xexample.+005+05896.key	X	2012
@@ -2148,67 +2168,71 @@
 ./bin/tests/system/rsabigexponent/ns2/dsset-example.in	X	2012
 ./bin/tests/system/rsabigexponent/ns2/example.db.bad	ZONE	2012,2016
 ./bin/tests/system/rsabigexponent/ns2/example.db.in	ZONE	2012,2016
-./bin/tests/system/rsabigexponent/ns2/named.conf	CONF-C	2012,2016
+./bin/tests/system/rsabigexponent/ns2/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns2/sign.sh	SH	2012,2014,2016
-./bin/tests/system/rsabigexponent/ns3/named.conf	CONF-C	2012,2016
-./bin/tests/system/rsabigexponent/prereq.sh	SH	2012,2014,2016,2017
-./bin/tests/system/rsabigexponent/setup.sh	SH	2012,2014,2016,2017
-./bin/tests/system/rsabigexponent/tests.sh	SH	2012,2016
-./bin/tests/system/run.sh			SH	2000,2001,2004,2007,2010,2012,2014,2015,2016,2017
-./bin/tests/system/runall.sh			SH	2000,2001,2004,2007,2010,2011,2012,2014,2015,2016
+./bin/tests/system/rsabigexponent/ns3/named.conf.in	CONF-C	2012,2016,2018
+./bin/tests/system/rsabigexponent/prereq.sh	SH	2012,2014,2016,2017,2018
+./bin/tests/system/rsabigexponent/setup.sh	SH	2012,2014,2016,2017,2018
+./bin/tests/system/rsabigexponent/tests.sh	SH	2012,2016,2018
+./bin/tests/system/run.sh			SH	2000,2001,2004,2007,2010,2012,2014,2015,2016,2017,2018
+./bin/tests/system/runall.sh			SH	2000,2001,2004,2007,2010,2011,2012,2014,2015,2016,2018
+./bin/tests/system/runsequential.sh		SH	2018
 ./bin/tests/system/runtime/README		TXT.BRIEF	2014,2016
-./bin/tests/system/runtime/clean.sh		SH	2014,2015,2016,2017
-./bin/tests/system/runtime/ns2/named-alt1.conf	CONF-C	2014,2016
-./bin/tests/system/runtime/ns2/named-alt2.conf	CONF-C	2014,2016,2017
-./bin/tests/system/runtime/ns2/named-alt3.conf	CONF-C	2015,2016,2017
-./bin/tests/system/runtime/ns2/named-alt4.conf	CONF-C	2017
-./bin/tests/system/runtime/ns2/named-alt5.conf	CONF-C	2017
-./bin/tests/system/runtime/ns2/named-alt6.conf	CONF-C	2017
-./bin/tests/system/runtime/ns2/named1.conf	CONF-C	2017
-./bin/tests/system/runtime/setup.sh		SH	2015,2016,2017
-./bin/tests/system/runtime/tests.sh		SH	2014,2015,2016,2017
+./bin/tests/system/runtime/clean.sh		SH	2014,2015,2016,2017,2018
+./bin/tests/system/runtime/ns2/named-alt1.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/runtime/ns2/named-alt2.conf.in	CONF-C	2014,2016,2017,2018
+./bin/tests/system/runtime/ns2/named-alt3.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/runtime/ns2/named-alt4.conf.in	CONF-C	2017,2018
+./bin/tests/system/runtime/ns2/named-alt5.conf.in	CONF-C	2017,2018
+./bin/tests/system/runtime/ns2/named-alt6.conf.in	CONF-C	2017,2018
+./bin/tests/system/runtime/ns2/named1.conf.in	CONF-C	2017,2018
+./bin/tests/system/runtime/setup.sh		SH	2015,2016,2017,2018
+./bin/tests/system/runtime/tests.sh		SH	2014,2015,2016,2017,2018
 ./bin/tests/system/send.pl			PERL	2001,2004,2007,2011,2012,2016
-./bin/tests/system/serve-stale/ans2/ans.pl	PERL	2017
-./bin/tests/system/serve-stale/clean.sh		SH	2017
-./bin/tests/system/serve-stale/ns1/named1.conf	CONF-C	2017
-./bin/tests/system/serve-stale/ns1/named2.conf	CONF-C	2017
+./bin/tests/system/serve-stale/.gitignore	X	2018
+./bin/tests/system/serve-stale/ans2/ans.pl	PERL	2017,2018
+./bin/tests/system/serve-stale/clean.sh		SH	2017,2018
+./bin/tests/system/serve-stale/ns1/named1.conf.in	CONF-C	2017,2018
+./bin/tests/system/serve-stale/ns1/named2.conf.in	CONF-C	2017,2018
 ./bin/tests/system/serve-stale/ns1/root.db	ZONE	2017
-./bin/tests/system/serve-stale/ns3/named.conf	CONF-C	2017
+./bin/tests/system/serve-stale/ns3/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/serve-stale/prereq.sh	SH	2017
-./bin/tests/system/serve-stale/setup.sh		SH	2017
-./bin/tests/system/serve-stale/tests.sh		SH	2017
+./bin/tests/system/serve-stale/setup.sh		SH	2017,2018
+./bin/tests/system/serve-stale/tests.sh		SH	2017,2018
 ./bin/tests/system/setup.sh			SH	2000,2001,2004,2007,2012,2014,2016
 ./bin/tests/system/sfcache/README		TXT.BRIEF	2014,2016
 ./bin/tests/system/sfcache/clean.sh		SH	2014,2015,2016,2017,2018
-./bin/tests/system/sfcache/ns1/named.conf	CONF-C	2014,2016
+./bin/tests/system/sfcache/ns1/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/sfcache/ns1/root.db.in	ZONE	2014,2016
 ./bin/tests/system/sfcache/ns1/sign.sh		SH	2014,2016,2017
 ./bin/tests/system/sfcache/ns2/example.db.in	ZONE	2014,2016
-./bin/tests/system/sfcache/ns2/named.conf	CONF-C	2014,2016
+./bin/tests/system/sfcache/ns2/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/sfcache/ns2/sign.sh		SH	2014,2016
-./bin/tests/system/sfcache/ns5/named.conf	CONF-C	2014,2016,2017
+./bin/tests/system/sfcache/ns5/named.conf.in	CONF-C	2014,2016,2017,2018
 ./bin/tests/system/sfcache/ns5/trusted.conf.bad	CONF-C	2014,2016
 ./bin/tests/system/sfcache/prereq.sh		SH	2014,2016,2017
-./bin/tests/system/sfcache/setup.sh		SH	2014,2016,2017
+./bin/tests/system/sfcache/setup.sh		SH	2014,2016,2017,2018
 ./bin/tests/system/sfcache/tests.sh		SH	2014,2016,2017,2018
 ./bin/tests/system/smartsign/child.db		ZONE	2010,2016
 ./bin/tests/system/smartsign/clean.sh		SH	2010,2012,2014,2016
 ./bin/tests/system/smartsign/parent.db		ZONE	2010,2016
 ./bin/tests/system/smartsign/prereq.sh		SH	2010,2012,2014,2016
 ./bin/tests/system/smartsign/setup.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/smartsign/tests.sh		SH	2010,2011,2012,2014,2016,2017
-./bin/tests/system/sortlist/clean.sh		SH	2000,2001,2004,2007,2009,2012,2014,2015,2016
+./bin/tests/system/smartsign/tests.sh		SH	2010,2011,2012,2014,2016,2017,2018
+./bin/tests/system/sortlist/clean.sh		SH	2000,2001,2004,2007,2009,2012,2014,2015,2016,2018
 ./bin/tests/system/sortlist/ns1/example.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/sortlist/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016
+./bin/tests/system/sortlist/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/sortlist/ns1/root.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/sortlist/tests.sh		SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/spf/clean.sh			SH	2013,2014,2016
-./bin/tests/system/spf/ns1/named.conf		CONF-C	2013,2016
+./bin/tests/system/sortlist/setup.sh		SH	2018
+./bin/tests/system/sortlist/tests.sh		SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/spf/clean.sh			SH	2013,2014,2016,2018
+./bin/tests/system/spf/ns1/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/spf/ns1/spf.db		ZONE	2013,2016
-./bin/tests/system/spf/tests.sh			SH	2013,2014,2016
-./bin/tests/system/start.pl			SH	2001,2004,2005,2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017
+./bin/tests/system/spf/setup.sh			SH	2018
+./bin/tests/system/spf/tests.sh			SH	2013,2014,2016,2018
+./bin/tests/system/start.pl			SH	2001,2004,2005,2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/start.sh			SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/staticstub/clean.sh		SH	2010,2012,2014,2015,2016
+./bin/tests/system/staticstub/clean.sh		SH	2010,2012,2014,2015,2016,2018
 ./bin/tests/system/staticstub/conf/bad01.conf	CONF-C	2010,2016
 ./bin/tests/system/staticstub/conf/bad02.conf	CONF-C	2010,2016
 ./bin/tests/system/staticstub/conf/bad03.conf	CONF-C	2010,2016
@@ -2226,45 +2250,47 @@
 ./bin/tests/system/staticstub/conf/good04.conf	CONF-C	2010,2016
 ./bin/tests/system/staticstub/conf/good05.conf	CONF-C	2010,2016
 ./bin/tests/system/staticstub/knowngood.dig.out.rec	X	2010,2013
-./bin/tests/system/staticstub/ns1/named.conf	CONF-C	2010,2016
+./bin/tests/system/staticstub/ns1/named.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/staticstub/ns1/root.db	ZONE	2010,2016
-./bin/tests/system/staticstub/ns2/named.conf.in	CONF-C	2010,2015,2016
+./bin/tests/system/staticstub/ns2/named.conf.in	CONF-C	2010,2015,2016,2018
 ./bin/tests/system/staticstub/ns3/example.db.in	ZONE	2010,2016
 ./bin/tests/system/staticstub/ns3/example.org.db	ZONE	2010,2016
-./bin/tests/system/staticstub/ns3/named.conf.in	CONF-C	2010,2013,2015,2016
+./bin/tests/system/staticstub/ns3/named.conf.in	CONF-C	2010,2013,2015,2016,2018
 ./bin/tests/system/staticstub/ns3/sign.sh	SH	2010,2012,2014,2015,2016
 ./bin/tests/system/staticstub/ns3/undelegated.db.in	ZONE	2015,2016
 ./bin/tests/system/staticstub/ns4/example.com.db	ZONE	2010,2016
 ./bin/tests/system/staticstub/ns4/example.info.db	ZONE	2010,2016
 ./bin/tests/system/staticstub/ns4/example.org.db	ZONE	2010,2016
-./bin/tests/system/staticstub/ns4/named.conf	CONF-C	2010,2016
+./bin/tests/system/staticstub/ns4/named.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/staticstub/ns4/sign.sh	SH	2010,2012,2014,2016,2017
 ./bin/tests/system/staticstub/ns4/sub.example.db.in	ZONE	2010,2016
 ./bin/tests/system/staticstub/prereq.sh		SH	2014,2016
-./bin/tests/system/staticstub/setup.sh		SH	2010,2012,2014,2016,2017
-./bin/tests/system/staticstub/tests.sh		SH	2010,2011,2012,2013,2015,2016
-./bin/tests/system/statistics/ans4/ans.pl	PERL	2012,2016
-./bin/tests/system/statistics/clean.sh		SH	2012,2014,2015,2016
-./bin/tests/system/statistics/ns1/named.conf	CONF-C	2012,2015,2016
+./bin/tests/system/staticstub/setup.sh		SH	2010,2012,2014,2016,2017,2018
+./bin/tests/system/staticstub/tests.sh		SH	2010,2011,2012,2013,2015,2016,2018
+./bin/tests/system/statistics/ans4/ans.pl	PERL	2012,2016,2018
+./bin/tests/system/statistics/clean.sh		SH	2012,2014,2015,2016,2018
+./bin/tests/system/statistics/ns1/named.conf.in	CONF-C	2012,2015,2016,2018
 ./bin/tests/system/statistics/ns1/root.db	ZONE	2012,2016
 ./bin/tests/system/statistics/ns1/zone.db	ZONE	2015,2016
 ./bin/tests/system/statistics/ns2/example.db	ZONE	2012,2016
 ./bin/tests/system/statistics/ns2/internal.db	ZONE	2012,2016
-./bin/tests/system/statistics/ns2/named.conf	CONF-C	2012,2015,2016
+./bin/tests/system/statistics/ns2/named.conf.in	CONF-C	2012,2015,2016,2018
 ./bin/tests/system/statistics/ns3/internal.db	ZONE	2012,2016
-./bin/tests/system/statistics/ns3/named.conf	CONF-C	2012,2013,2015,2016
+./bin/tests/system/statistics/ns3/named.conf.in	CONF-C	2012,2013,2015,2016,2018
 ./bin/tests/system/statistics/ns3/root.hint	ZONE	2012,2016
-./bin/tests/system/statistics/prereq.sh		SH	2012,2014,2016
-./bin/tests/system/statistics/tests.sh		SH	2012,2015,2016,2017
-./bin/tests/system/statschannel/clean.sh	SH	2015,2016,2017
+./bin/tests/system/statistics/prereq.sh		SH	2012,2014,2016,2018
+./bin/tests/system/statistics/setup.sh		SH	2018
+./bin/tests/system/statistics/tests.sh		SH	2012,2015,2016,2017,2018
+./bin/tests/system/statschannel/clean.sh	SH	2015,2016,2017,2018
 ./bin/tests/system/statschannel/fetch.pl	PERL	2015,2016
 ./bin/tests/system/statschannel/mem-xml.pl	PERL	2017
 ./bin/tests/system/statschannel/ns2/example.db	ZONE	2015,2016
-./bin/tests/system/statschannel/ns2/named.conf	CONF-C	2015,2016,2017
-./bin/tests/system/statschannel/prereq.sh	SH	2015,2016
+./bin/tests/system/statschannel/ns2/named.conf.in	CONF-C	2015,2016,2017,2018
+./bin/tests/system/statschannel/prereq.sh	SH	2015,2016,2018
 ./bin/tests/system/statschannel/server-json.pl	PERL	2015,2016,2017
 ./bin/tests/system/statschannel/server-xml.pl	PERL	2015,2016,2017
-./bin/tests/system/statschannel/tests.sh	SH	2015,2016,2017
+./bin/tests/system/statschannel/setup.sh	SH	2018
+./bin/tests/system/statschannel/tests.sh	SH	2015,2016,2017,2018
 ./bin/tests/system/statschannel/traffic-json.pl	PERL	2015,2016,2017
 ./bin/tests/system/statschannel/traffic-xml.pl	PERL	2015,2016,2017
 ./bin/tests/system/statschannel/traffic.expect.1	X	2015
@@ -2272,56 +2298,57 @@
 ./bin/tests/system/statschannel/traffic.expect.4	X	2015
 ./bin/tests/system/statschannel/traffic.expect.5	X	2015,2016
 ./bin/tests/system/statschannel/traffic.expect.6	X	2015,2016
-./bin/tests/system/stop.pl			SH	2001,2004,2005,2006,2007,2012,2016,2017
+./bin/tests/system/stop.pl			SH	2001,2004,2005,2006,2007,2012,2016,2017,2018
 ./bin/tests/system/stop.sh			SH	2000,2001,2004,2007,2012,2016
 ./bin/tests/system/stress/clean.sh		SH	2000,2001,2004,2007,2012,2014,2016
 ./bin/tests/system/stress/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016
-./bin/tests/system/stress/ns2/named.conf	CONF-C	2000,2001,2004,2007,2016
 ./bin/tests/system/stress/ns3/named.conf	CONF-C	2000,2001,2004,2007,2013,2016,2017
-./bin/tests/system/stress/ns4/named.conf	CONF-C	2000,2001,2004,2007,2016,2017
 ./bin/tests/system/stress/prereq.sh		SH	2015,2016
 ./bin/tests/system/stress/setup.pl		PERL	2000,2001,2004,2007,2012,2016
 ./bin/tests/system/stress/setup.sh		SH	2000,2001,2004,2007,2012,2016
 ./bin/tests/system/stress/tests.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016
 ./bin/tests/system/stress/update.pl		PERL	2000,2001,2004,2007,2012,2016
-./bin/tests/system/stub/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016
+./bin/tests/system/stub/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/stub/knowngood.dig.out.norec	X	2000,2001
 ./bin/tests/system/stub/knowngood.dig.out.rec	X	2000,2001,2013
-./bin/tests/system/stub/ns1/named.conf		CONF-C	2000,2001,2004,2007,2016,2017
+./bin/tests/system/stub/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/stub/ns1/root.db		ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/stub/ns2/child.example.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/stub/ns2/named.conf		CONF-C	2000,2001,2004,2007,2016,2017
+./bin/tests/system/stub/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/stub/ns3/example.db		ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/stub/ns3/named.conf		CONF-C	2000,2001,2004,2007,2016,2017
-./bin/tests/system/stub/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2016
-./bin/tests/system/synthfromdnssec/clean.sh	SH	2017
+./bin/tests/system/stub/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2017,2018
+./bin/tests/system/stub/setup.sh		SH	2018
+./bin/tests/system/stub/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2016,2018
+./bin/tests/system/synthfromdnssec/clean.sh	SH	2017,2018
 ./bin/tests/system/synthfromdnssec/ns1/example.db.in	ZONE	2017
-./bin/tests/system/synthfromdnssec/ns1/named.conf	CONF-C	2017
+./bin/tests/system/synthfromdnssec/ns1/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/synthfromdnssec/ns1/root.db.in	ZONE	2017
 ./bin/tests/system/synthfromdnssec/ns1/sign.sh	SH	2017
-./bin/tests/system/synthfromdnssec/ns2/named.conf	CONF-C	2017
+./bin/tests/system/synthfromdnssec/ns2/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/synthfromdnssec/ns2/root.hints	ZONE	2017
-./bin/tests/system/synthfromdnssec/ns3/named.conf	CONF-C	2017
+./bin/tests/system/synthfromdnssec/ns3/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/synthfromdnssec/ns3/redirect.db	ZONE	2017
 ./bin/tests/system/synthfromdnssec/ns3/root.hints	ZONE	2017
-./bin/tests/system/synthfromdnssec/ns4/named.conf	CONF-C	2017
+./bin/tests/system/synthfromdnssec/ns4/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/synthfromdnssec/ns4/root.hints	ZONE	2017
-./bin/tests/system/synthfromdnssec/ns5/named.conf	CONF-C	2017
+./bin/tests/system/synthfromdnssec/ns5/named.conf.in	CONF-C	2017,2018
 ./bin/tests/system/synthfromdnssec/ns5/root.hints	ZONE	2017
 ./bin/tests/system/synthfromdnssec/prereq.sh	SH	2017
-./bin/tests/system/synthfromdnssec/setup.sh	SH	2017
-./bin/tests/system/synthfromdnssec/tests.sh	SH	2017
-./bin/tests/system/tcp/clean.sh			SH	2014,2016
-./bin/tests/system/tcp/ns1/named.conf		CONF-C	2014,2016
+./bin/tests/system/synthfromdnssec/setup.sh	SH	2017,2018
+./bin/tests/system/synthfromdnssec/tests.sh	SH	2017,2018
+./bin/tests/system/tcp/clean.sh			SH	2014,2016,2018
+./bin/tests/system/tcp/ns1/named.conf.in	CONF-C	2014,2016,2018
 ./bin/tests/system/tcp/ns1/root.db		ZONE	2014,2016
 ./bin/tests/system/tcp/ns2/example.db		ZONE	2014,2016
-./bin/tests/system/tcp/ns2/named.conf		CONF-C	2014,2016
-./bin/tests/system/tcp/ns3/named.conf		CONF-C	2014,2016
-./bin/tests/system/tcp/ns4/named.conf		CONF-C	2014,2016
-./bin/tests/system/tcp/tests.sh			SH	2014,2016
+./bin/tests/system/tcp/ns2/named.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/tcp/ns3/named.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/tcp/ns4/named.conf.in	CONF-C	2014,2016,2018
+./bin/tests/system/tcp/setup.sh			SH	2018
+./bin/tests/system/tcp/tests.sh			SH	2014,2016,2018
 ./bin/tests/system/testcrypto.sh		SH	2014,2016,2017
 ./bin/tests/system/testsock.pl			PERL	2000,2001,2004,2007,2010,2011,2012,2013,2016
 ./bin/tests/system/testsock6.pl			PERL	2010,2012,2014,2016
+./bin/tests/system/testsummary.sh		SH	2018
 ./bin/tests/system/tkey/Makefile.in		MAKE	2001,2002,2004,2007,2009,2012,2014,2015,2016,2017
 ./bin/tests/system/tkey/clean.sh		SH	2001,2004,2007,2011,2012,2013,2014,2015,2016
 ./bin/tests/system/tkey/keycreate.c		C	2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2017
@@ -2333,23 +2360,23 @@
 ./bin/tests/system/tkey/setup.sh		SH	2001,2004,2007,2009,2012,2013,2014,2016,2017
 ./bin/tests/system/tkey/tests.sh		SH	2001,2004,2007,2009,2011,2012,2013,2014,2016,2017
 ./bin/tests/system/tools/clean.sh		SH	2017
-./bin/tests/system/tools/tests.sh		SH	2017
+./bin/tests/system/tools/tests.sh		SH	2017,2018
 ./bin/tests/system/tsig/clean.sh		SH	2005,2006,2007,2012,2014,2016,2018
 ./bin/tests/system/tsig/ns1/example.db		ZONE	2005,2006,2007,2009,2012,2016
-./bin/tests/system/tsig/ns1/named.conf		CONF-C	2005,2006,2007,2016
-./bin/tests/system/tsig/setup.sh		SH	2016,2017
+./bin/tests/system/tsig/ns1/named.conf.in	CONF-C	2005,2006,2007,2016,2018
+./bin/tests/system/tsig/setup.sh		SH	2016,2017,2018
 ./bin/tests/system/tsig/tests.sh		SH	2005,2006,2007,2011,2012,2016,2018
-./bin/tests/system/tsiggss/authsock.pl		PERL	2011,2012,2016
-./bin/tests/system/tsiggss/clean.sh		SH	2010,2011,2014,2015,2016
+./bin/tests/system/tsiggss/authsock.pl		PERL	2011,2012,2016,2018
+./bin/tests/system/tsiggss/clean.sh		SH	2010,2011,2014,2015,2016,2018
 ./bin/tests/system/tsiggss/ns1/administrator.ccache	X	2010
 ./bin/tests/system/tsiggss/ns1/dns.keytab	X	2010
 ./bin/tests/system/tsiggss/ns1/example.nil.db.in	X	2011
-./bin/tests/system/tsiggss/ns1/named.conf	CONF-C	2010,2011,2013,2016
+./bin/tests/system/tsiggss/ns1/named.conf.in	CONF-C	2010,2011,2013,2016,2018
 ./bin/tests/system/tsiggss/ns1/testdenied.ccache	X	2010
-./bin/tests/system/tsiggss/prereq.sh		SH	2010,2011,2012,2014,2016
-./bin/tests/system/tsiggss/setup.sh		SH	2010,2011,2012,2014,2016,2017
-./bin/tests/system/tsiggss/tests.sh		SH	2010,2011,2014,2016,2017
-./bin/tests/system/unknown/clean.sh		SH	2000,2001,2004,2007,2012,2013,2014,2015,2016
+./bin/tests/system/tsiggss/prereq.sh		SH	2010,2011,2012,2014,2016,2018
+./bin/tests/system/tsiggss/setup.sh		SH	2010,2011,2012,2014,2016,2017,2018
+./bin/tests/system/tsiggss/tests.sh		SH	2010,2011,2014,2016,2017,2018
+./bin/tests/system/unknown/clean.sh		SH	2000,2001,2004,2007,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/unknown/large.out		X	2012
 ./bin/tests/system/unknown/ns1/broken1.db	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/unknown/ns1/broken2.db	ZONE	2000,2001,2004,2007,2016
@@ -2360,46 +2387,37 @@
 ./bin/tests/system/unknown/ns1/example-class10.db	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/unknown/ns1/example-in.db	ZONE	2000,2001,2004,2007,2011,2012,2016
 ./bin/tests/system/unknown/ns1/large.db		ZONE	2012,2016
-./bin/tests/system/unknown/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016
-./bin/tests/system/unknown/ns2/named.conf	CONF-C	2012,2016
-./bin/tests/system/unknown/ns3/named.conf	CONF-C	2012,2016
+./bin/tests/system/unknown/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
+./bin/tests/system/unknown/ns2/named.conf.in	CONF-C	2012,2016,2018
+./bin/tests/system/unknown/ns3/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/unknown/ns3/sign.sh		SH	2012,2014,2016,2017
 ./bin/tests/system/unknown/prereq.sh		SH	2014,2016
-./bin/tests/system/unknown/setup.sh		SH	2012,2014,2016,2017
-./bin/tests/system/unknown/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2016
+./bin/tests/system/unknown/setup.sh		SH	2012,2014,2016,2017,2018
+./bin/tests/system/unknown/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/unknown/zones/nan.bad	ZONE	2013,2016
-./bin/tests/system/upforwd/ans4/ans.pl		PERL	2011,2012,2016
-./bin/tests/system/upforwd/clean.sh		SH	2000,2001,2004,2007,2011,2012,2014,2015,2016
+./bin/tests/system/upforwd/ans4/ans.pl		PERL	2011,2012,2016,2018
+./bin/tests/system/upforwd/clean.sh		SH	2000,2001,2004,2007,2011,2012,2014,2015,2016,2018
 ./bin/tests/system/upforwd/knowngood.after1	X	2000,2001
 ./bin/tests/system/upforwd/knowngood.after2	X	2000,2001
 ./bin/tests/system/upforwd/knowngood.before	X	2000,2001
 ./bin/tests/system/upforwd/knowngood.ns2.before	X	2000,2001
 ./bin/tests/system/upforwd/ns1/example1.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/upforwd/ns1/named.conf	CONF-C	2000,2001,2004,2007,2014,2016,2017
-./bin/tests/system/upforwd/ns2/named.conf	CONF-C	2000,2001,2004,2007,2014,2016,2017
-./bin/tests/system/upforwd/ns3/named.conf	CONF-C	2000,2001,2004,2007,2011,2014,2016,2017
+./bin/tests/system/upforwd/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2014,2016,2017,2018
+./bin/tests/system/upforwd/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2014,2016,2017,2018
+./bin/tests/system/upforwd/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2014,2016,2017,2018
 ./bin/tests/system/upforwd/ns3/nomaster.db	ZONE	2011,2016
-./bin/tests/system/upforwd/prereq.sh		SH	2012,2014,2016
-./bin/tests/system/upforwd/setup.sh		SH	2000,2001,2004,2007,2011,2012,2014,2016,2017
-./bin/tests/system/upforwd/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2016
-./bin/tests/system/v6synth/clean.sh		SH	2001,2004,2007,2012,2014,2016
-./bin/tests/system/v6synth/ns1/named.conf	CONF-C	2001,2004,2007,2016
-./bin/tests/system/v6synth/ns1/root.db		ZONE	2001,2004,2007,2016
-./bin/tests/system/v6synth/ns2/example.db	ZONE	2001,2004,2007,2016
-./bin/tests/system/v6synth/ns2/ip6.arpa.db	ZONE	2001,2002,2004,2007,2016
-./bin/tests/system/v6synth/ns2/ip6.int.db	ZONE	2001,2004,2007,2016
-./bin/tests/system/v6synth/ns2/named.conf	CONF-C	2001,2004,2007,2016,2017
-./bin/tests/system/v6synth/ns3/named.conf	CONF-C	2001,2004,2007,2016,2017
-./bin/tests/system/v6synth/tests.sh		SH	2001,2004,2007,2012,2016
+./bin/tests/system/upforwd/prereq.sh		SH	2012,2014,2016,2018
+./bin/tests/system/upforwd/setup.sh		SH	2000,2001,2004,2007,2011,2012,2014,2016,2017,2018
+./bin/tests/system/upforwd/tests.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/verify/.gitignore		X	2012,2016
 ./bin/tests/system/verify/clean.sh		SH	2012,2014,2016
 ./bin/tests/system/verify/prereq.sh		SH	2014,2016
 ./bin/tests/system/verify/setup.sh		SH	2012,2014,2016,2017
-./bin/tests/system/verify/tests.sh		SH	2012,2013,2016,2017
-./bin/tests/system/verify/zones/genzones.sh	SH	2012,2013,2014,2016,2017
+./bin/tests/system/verify/tests.sh		SH	2012,2013,2016,2017,2018
+./bin/tests/system/verify/zones/genzones.sh	SH	2012,2013,2014,2016,2017,2018
 ./bin/tests/system/verify/zones/unsigned.db	ZONE	2012,2016
-./bin/tests/system/views/clean.sh		SH	2000,2001,2004,2005,2007,2012,2013,2014,2015,2016
-./bin/tests/system/views/ns1/named.conf		CONF-C	2000,2001,2004,2007,2016
+./bin/tests/system/views/clean.sh		SH	2000,2001,2004,2005,2007,2012,2013,2014,2015,2016,2018
+./bin/tests/system/views/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/views/ns1/root.db		ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/views/ns2/.gitignore		X	2012
 ./bin/tests/system/views/ns2/1.10.in-addr.arpa.db	ZONE	2015,2016
@@ -2409,36 +2427,36 @@
 ./bin/tests/system/views/ns2/external/inline.db	ZONE	2014,2016
 ./bin/tests/system/views/ns2/internal.db	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/views/ns2/internal/inline.db	ZONE	2014,2016
-./bin/tests/system/views/ns2/named1.conf	CONF-C	2000,2001,2004,2007,2013,2016
-./bin/tests/system/views/ns2/named2.conf	CONF-C	2000,2001,2004,2007,2013,2014,2015,2016
+./bin/tests/system/views/ns2/named1.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
+./bin/tests/system/views/ns2/named2.conf.in	CONF-C	2000,2001,2004,2007,2013,2014,2015,2016,2018
 ./bin/tests/system/views/ns3/.gitignore		X	2012
 ./bin/tests/system/views/ns3/child.clone.db	ZONE	2013,2016
 ./bin/tests/system/views/ns3/internal.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/views/ns3/named1.conf	CONF-C	2000,2001,2004,2007,2013,2016
-./bin/tests/system/views/ns3/named2.conf	CONF-C	2000,2001,2004,2007,2013,2016
+./bin/tests/system/views/ns3/named1.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
+./bin/tests/system/views/ns3/named2.conf.in	CONF-C	2000,2001,2004,2007,2013,2016,2018
 ./bin/tests/system/views/ns5/child.clone.db	ZONE	2013,2016
-./bin/tests/system/views/ns5/named.conf		CONF-C	2013,2016
-./bin/tests/system/views/setup.sh		SH	2000,2001,2004,2007,2012,2014,2016,2017
-./bin/tests/system/views/tests.sh		SH	2000,2001,2004,2007,2012,2013,2014,2016
-./bin/tests/system/wildcard/clean.sh		SH	2012,2013,2014,2016
+./bin/tests/system/views/ns5/named.conf.in	CONF-C	2013,2016,2018
+./bin/tests/system/views/setup.sh		SH	2000,2001,2004,2007,2012,2014,2016,2017,2018
+./bin/tests/system/views/tests.sh		SH	2000,2001,2004,2007,2012,2013,2014,2016,2018
+./bin/tests/system/wildcard/clean.sh		SH	2012,2013,2014,2016,2018
 ./bin/tests/system/wildcard/ns1/dlv.db.in	ZONE	2013,2016
-./bin/tests/system/wildcard/ns1/named.conf	CONF-C	2012,2013,2016
+./bin/tests/system/wildcard/ns1/named.conf.in	CONF-C	2012,2013,2016,2018
 ./bin/tests/system/wildcard/ns1/nsec.db.in	ZONE	2012,2013,2016
 ./bin/tests/system/wildcard/ns1/nsec3.db.in	ZONE	2012,2013,2016
 ./bin/tests/system/wildcard/ns1/private.nsec.db.in	ZONE	2012,2013,2016
 ./bin/tests/system/wildcard/ns1/private.nsec3.db.in	ZONE	2012,2013,2016
 ./bin/tests/system/wildcard/ns1/root.db.in	ZONE	2012,2013,2016
-./bin/tests/system/wildcard/ns1/sign.sh		SH	2012,2013,2014,2016
+./bin/tests/system/wildcard/ns1/sign.sh		SH	2012,2013,2014,2016,2018
 ./bin/tests/system/wildcard/ns2/hints		ZONE	2012,2016
-./bin/tests/system/wildcard/ns2/named.conf	CONF-C	2012,2016
+./bin/tests/system/wildcard/ns2/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/wildcard/ns3/hints		ZONE	2012,2016
-./bin/tests/system/wildcard/ns3/named.conf	CONF-C	2012,2016
-./bin/tests/system/wildcard/ns4/named.conf	CONF-C	2012,2016
+./bin/tests/system/wildcard/ns3/named.conf.in	CONF-C	2012,2016,2018
+./bin/tests/system/wildcard/ns4/named.conf.in	CONF-C	2012,2016,2018
 ./bin/tests/system/wildcard/ns5/hints		ZONE	2013,2016
-./bin/tests/system/wildcard/ns5/named.conf	CONF-C	2013,2016
+./bin/tests/system/wildcard/ns5/named.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/wildcard/prereq.sh		SH	2014,2016
-./bin/tests/system/wildcard/setup.sh		SH	2012,2014,2016,2017
-./bin/tests/system/wildcard/tests.sh		SH	2012,2013,2016
+./bin/tests/system/wildcard/setup.sh		SH	2012,2014,2016,2017,2018
+./bin/tests/system/wildcard/tests.sh		SH	2012,2013,2016,2018
 ./bin/tests/system/win32/bigkey.vcxproj.filters.in	X	2016
 ./bin/tests/system/win32/bigkey.vcxproj.in	X	2016,2017
 ./bin/tests/system/win32/bigkey.vcxproj.user	X	2016
@@ -2463,63 +2481,63 @@
 ./bin/tests/system/xfer/ans5/unknownkey		X	2011
 ./bin/tests/system/xfer/ans5/unsigned		X	2011
 ./bin/tests/system/xfer/ans5/wrongkey		X	2011
-./bin/tests/system/xfer/clean.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2015,2016
+./bin/tests/system/xfer/clean.sh		SH	2000,2001,2004,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/xfer/dig1.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/system/xfer/dig2.good		X	2000,2001,2003,2004,2009,2011,2012,2013,2014,2015,2016,2017
 ./bin/tests/system/xfer/knowngood.mapped	X	2016
 ./bin/tests/system/xfer/ns1/axfr-too-big.db	ZONE	2016
 ./bin/tests/system/xfer/ns1/ixfr-too-big.db.in	ZONE	2016
-./bin/tests/system/xfer/ns1/named.conf		CONF-C	2000,2001,2004,2007,2011,2014,2016
+./bin/tests/system/xfer/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2014,2016,2018
 ./bin/tests/system/xfer/ns1/root.db		ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/xfer/ns2/mapped.db.in	ZONE	2016
-./bin/tests/system/xfer/ns2/named.conf		CONF-C	2000,2001,2004,2005,2007,2013,2016
+./bin/tests/system/xfer/ns2/named.conf.in	CONF-C	2000,2001,2004,2005,2007,2013,2016,2018
 ./bin/tests/system/xfer/ns2/slave.db.in		ZONE	2013,2016
-./bin/tests/system/xfer/ns3/named.conf		CONF-C	2000,2001,2004,2007,2011,2013,2016,2017
-./bin/tests/system/xfer/ns4/named.conf.base	CONF-C	2011,2013,2016
+./bin/tests/system/xfer/ns3/named.conf.in	CONF-C	2000,2001,2004,2007,2011,2013,2016,2017,2018
+./bin/tests/system/xfer/ns4/named.conf.base	CONF-C	2011,2013,2016,2018
 ./bin/tests/system/xfer/ns4/root.db.in		ZONE	2011,2016
-./bin/tests/system/xfer/ns6/named.conf		CONF-C	2011,2014,2016
-./bin/tests/system/xfer/ns7/named.conf		CONF-C	2011,2014,2016
+./bin/tests/system/xfer/ns6/named.conf.in	CONF-C	2011,2014,2016,2018
+./bin/tests/system/xfer/ns7/named.conf.in	CONF-C	2011,2014,2016,2018
 ./bin/tests/system/xfer/ns8/.gitignore		X	2015
 ./bin/tests/system/xfer/ns8/example.db		ZONE	2015,2016
-./bin/tests/system/xfer/ns8/named.conf		CONF-C	2015,2016
-./bin/tests/system/xfer/prereq.sh		SH	2011,2012,2014,2016
-./bin/tests/system/xfer/setup.sh		SH	2001,2002,2004,2007,2011,2012,2013,2014,2015,2016
-./bin/tests/system/xfer/tests.sh		SH	2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016
-./bin/tests/system/xferquota/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016
+./bin/tests/system/xfer/ns8/named.conf.in	CONF-C	2015,2016,2018
+./bin/tests/system/xfer/prereq.sh		SH	2011,2012,2014,2016,2018
+./bin/tests/system/xfer/setup.sh		SH	2001,2002,2004,2007,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/xfer/tests.sh		SH	2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016,2018
+./bin/tests/system/xferquota/clean.sh		SH	2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/xferquota/ns1/changing1.db	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/xferquota/ns1/changing2.db	ZONE	2000,2001,2004,2007,2016
-./bin/tests/system/xferquota/ns1/named.conf	CONF-C	2000,2001,2004,2007,2016
+./bin/tests/system/xferquota/ns1/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xferquota/ns1/root.db	ZONE	2000,2001,2004,2007,2016
 ./bin/tests/system/xferquota/ns2/example.db	ZONE	2000,2001,2002,2003,2004,2007,2009,2016
-./bin/tests/system/xferquota/ns2/named.conf	CONF-C	2000,2001,2004,2007,2016
+./bin/tests/system/xferquota/ns2/named.conf.in	CONF-C	2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xferquota/setup.pl		PERL	2000,2001,2004,2007,2011,2012,2016
-./bin/tests/system/xferquota/setup.sh		SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/xferquota/tests.sh		SH	2000,2001,2004,2007,2012,2016
-./bin/tests/system/zero/ans5/ans.pl		PERL	2016
-./bin/tests/system/zero/clean.sh		SH	2013,2014,2015,2016
-./bin/tests/system/zero/ns1/named.conf		CONF-C	2013,2016,2017
+./bin/tests/system/xferquota/setup.sh		SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/xferquota/tests.sh		SH	2000,2001,2004,2007,2012,2016,2018
+./bin/tests/system/zero/ans5/ans.pl		PERL	2016,2018
+./bin/tests/system/zero/clean.sh		SH	2013,2014,2015,2016,2018
+./bin/tests/system/zero/ns1/named.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/zero/ns1/root.db		ZONE	2013,2016
-./bin/tests/system/zero/ns2/named.conf		CONF-C	2013,2016,2017
+./bin/tests/system/zero/ns2/named.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/zero/ns2/tld.db		ZONE	2016
-./bin/tests/system/zero/ns3/named.conf		CONF-C	2013,2016,2017
+./bin/tests/system/zero/ns3/named.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/zero/ns3/root.hint		ZONE	2013,2016
-./bin/tests/system/zero/ns4/named.conf		CONF-C	2013,2016,2017
+./bin/tests/system/zero/ns4/named.conf.in	CONF-C	2013,2016,2017,2018
 ./bin/tests/system/zero/ns4/one.tld.db		ZONE	2016
-./bin/tests/system/zero/setup.sh		SH	2013,2014,2016
-./bin/tests/system/zero/tests.sh		SH	2013,2016,2017
+./bin/tests/system/zero/setup.sh		SH	2013,2014,2016,2018
+./bin/tests/system/zero/tests.sh		SH	2013,2016,2017,2018
 ./bin/tests/system/zonechecks/a.db		ZONE	2004,2007,2016
 ./bin/tests/system/zonechecks/aaaa.db		ZONE	2004,2007,2016
 ./bin/tests/system/zonechecks/bigserial.db	ZONE	2015,2016
-./bin/tests/system/zonechecks/clean.sh		SH	2004,2007,2012,2014,2015,2016
+./bin/tests/system/zonechecks/clean.sh		SH	2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/zonechecks/cname.db		ZONE	2004,2007,2016
 ./bin/tests/system/zonechecks/dname.db		ZONE	2004,2007,2016
 ./bin/tests/system/zonechecks/noaddress.db	ZONE	2004,2007,2016
-./bin/tests/system/zonechecks/ns1/named.conf	CONF-C	2012,2013,2014,2015,2016,2017
-./bin/tests/system/zonechecks/ns2/named.conf	CONF-C	2012,2013,2016,2017
+./bin/tests/system/zonechecks/ns1/named.conf.in	CONF-C	2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/zonechecks/ns2/named.conf.in	CONF-C	2012,2013,2016,2017,2018
 ./bin/tests/system/zonechecks/nxdomain.db	ZONE	2004,2007,2016
 ./bin/tests/system/zonechecks/prereq.sh		SH	2014,2016
-./bin/tests/system/zonechecks/setup.sh		SH	2012,2013,2014,2015,2016,2017
-./bin/tests/system/zonechecks/tests.sh		SH	2004,2007,2009,2012,2013,2014,2015,2016
+./bin/tests/system/zonechecks/setup.sh		SH	2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/zonechecks/tests.sh		SH	2004,2007,2009,2012,2013,2014,2015,2016,2018
 ./bin/tests/t_api.pl				PERL	1999,2000,2001,2004,2007,2012,2016
 ./bin/tests/task_test.c				C	1998,1999,2000,2001,2004,2007,2013,2014,2015,2016,2018
 ./bin/tests/tasks/Makefile.in			MAKE	1998,1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017
@@ -2822,16 +2840,6 @@
 ./contrib/dnspriv/README.md			MKD	2017
 ./contrib/dnspriv/named.conf			CONF-C	2017
 ./contrib/dnspriv/nginx.conf			SH	2017
-./contrib/docker/centos-amd64:latest/Dockerfile	X	2017
-./contrib/docker/debian-amd64:oldstable/Dockerfile	X	2017,2018
-./contrib/docker/debian-amd64:stable/Dockerfile	X	2017,2018
-./contrib/docker/debian-amd64:unstable/Dockerfile	X	2017,2018
-./contrib/docker/debian-i386:oldstable/Dockerfile	X	2017,2018
-./contrib/docker/debian-i386:stable/Dockerfile	X	2017,2018
-./contrib/docker/debian-i386:unstable/Dockerfile	X	2017,2018
-./contrib/docker/fedora-amd64:latest/Dockerfile	X	2017
-./contrib/docker/ubuntu-amd64:latest/Dockerfile	X	2017,2018
-./contrib/docker/ubuntu-i386:latest/Dockerfile	X	2017,2018
 ./contrib/idn/README.idnkit			X	2005,2009
 ./contrib/idn/idnkit-1.0-src/.gitignore		X	2014
 ./contrib/idn/idnkit-1.0-src/ChangeLog		X	2003