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

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/perlinger/ntp-stable-2745

bk: 554bb3abWVs_hZHOfb_q1yaXVIJXlg

diff --cc ChangeLog
index 30372087b2ec45b9c74ace27304b25d749e61651,676a90e004f0617232f9f510ca46146a28fca825..76e44110e65a2e54dde5508fc33d9b9800a109dc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,11 +1,17 @@@
  ---
  
 -* CID 1269537: Clean up a line of dead code in getShmTime().
 -* [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
 -  of 'limited'.
+ * [Bug 2745] ntpd -x steps clock on leap second 
+    Do leap second stepping only of the step adjustment is beyond the
+    proper jump distance limit and step correction is allowed at all. 
 +* CID 1295478: Quiet a pedantic potential error from the fix for Bug 2776.
 +* CID 1296235: Fix refclock_jjy.c and correcting type of the driver40-ja.html
 +* CID 1269537: Clean up a line of dead code in getShmTime().
 +* [Bug 2590] autogen-5.18.5.
 +* [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
 +  of 'limited'.
 +* [Bug 2650] fix includefile processing.
 +* [Bug 2776] Improve ntpq's 'help keytype'.
 +* [Bug 2782] Refactor refclock_shm.c, add memory barrier protection.
  * [Bug 2794] Clean up kernel clock status reports.
  * [Bug 2800] refclock_true.c true_debug() can't open debug log because
    of incompatible open/fdopen parameters.