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

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

bk: 5e916f1dIMnWcLZJJ3BoD-ywJKPhFw

diff --cc ChangeLog
index 46f98936a0887d1f52252bedc15485a040fb5bbd,0c5a89ec1de85e4a8fe6715611b430f0cad51c63..109cbd96784889ebadb5857b2099bbe439628ba8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,12 +1,13 @@@
  ---
 -*4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
++(4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
+ 
 +* [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>

diff --cc ntpd/ntp_proto.c
Simple merge