Merge bk://bk.ntp.org/ntp-stable

into  hms-mbp11.pfcs.com:/Users/harlan/src/ntp-stable-2853

bk: 558ad2a4Yb32Pel_Vuy25QgniZnpFA

diff --cc ChangeLog
index c7991356923ff8b63b0d2b7525e21845ae4f45e7,11543bb6d52406a48084cec9e9aa50205ac45491..649de7dbd9e4c78938d182db67067249a5c52713
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -24,9 -23,8 +24,10 @@@
     (The original topic was fixed in a byplay to bug#2830)
  * [Bug 2845] Harden memory allocation in ntpd.
  * [Bug 2852] 'make check' can't find unity.h.  Hal Murray.
+ * [Bug 2853] FICORA #829967
  * [Bug 2854] Missing brace in libntp/strdup.c.  Masanari Iida.
 +* [Bug 2855] Implement conditional leap smear code.  Martin Burnicki.
 +* [Bug 2855] leap smear cleanup.  Harlan Stenn.
  * Initial support for experimental leap smear code.  Harlan Stenn.
  * Fixes to sntp/tests/fileHandlingTest.h.in.  Harlan Stenn.
  * Report select() debug messages at debug level 3 now.

diff --cc ntpd/ntp_control.c
Simple merge