Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3659

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15

bk: 5e917b4e_tRJw5_kI1KsuGTNeIIn9Q

diff --cc ChangeLog
index 63aac86d46d56ecd7fbec8133560eab97c9408b6,109cbd96784889ebadb5857b2099bbe439628ba8..ed6cfb98d76e110d5cba9510b2fddc9c07725f64
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,13 +1,15 @@@
  ---
- * [Bug 3659] ntp-4.2.8p14 fails to build <perlinger@ntp.org>
+ (4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
+ 
++* [Bug 3659] Move definition of psl[] from ntp_config.h to
++  ntp_config.h <perlinger@ntp.org>
+ * [Bug 3657] Wrong "Autokey group mismatch" debug message <perlinger@ntp.org>
+ * [Bug 3655] ntpdc memstats hash counts <perlinger@ntp.org>
+   - fix by Gerry garvey
+ * [Bug 3653] Refclock jitter RMS calculation <perlinger@ntp.org>
+   - thanks to Gerry Garvey
+ * [Bug 3646] Avoid sync with unsync orphan <perlinger@ntp.org>
+   - patch by Gerry Garvey
  
  ---
  (4.2.8p14) 2020/03/03 Released by Harlan Stenn <stenn@ntp.org>