Merge ntp-build.tal1.ntfo.org:/ntpbuild/data/test/ntp-stable

into  ntp-build.tal1.ntfo.org:/ntpbuild/data/test/ntp-dev

bk: 676fcae27bfE7AffuZirFV3YMBmqAg

diff --cc ChangeLog
index 54ba4b8316501d19e030183b462d6a795fab01a7,df15157be0458a4de3336d5caf96f17cde40d9eb..c21fd734edcd3a3545d0874782e6dcb220f2883d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,7 @@@
 ----
 +
  * [Bug 3960] Remove duplicate ntp.conf.def content, reported by
               Ulrich Windl. <stenn@ntp.org>
+ * Makefile.am: Another tweak to check-local.  <stenn@ntp.org>
  * cleanup github-specific files.  <stenn@ntp.org>
  * Add COPYRIGHT.md and LICENSE.md.  <stenn@ntp.org>
  * Makefile.am: Fix distcheck problem with check-local.  <stenn@ntp.org>