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

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

bk: 676f965eryWFp0gTMW2ekzfcW8aXIA

diff --cc ChangeLog
index 7d2e8ba602dcd6f6056bd7bc880726964f7c0d9a,b33ebcf72722d54c72f9adf3a9f20ee14ee19050..54ba4b8316501d19e030183b462d6a795fab01a7
--- 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>
+ * 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>
  * Add .github to the top-level tree. <dlavigne@nwtime.org>