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

into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2745

bk: 5541164c9BHQTg0_OtMxhEdrqoQPNw

diff --cc ChangeLog
index 0873beb0ad4c5db09e93d9e0defea2b57c776d5c,5ddb578ed81b121af248a68d3dae13c04beafc5d..c20ddc9ffe39c3cb89040eb8270995ed99036f53
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,14 @@@
  ---
  
 +* [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 1269537: Clean up a line of dead code in getShmTime().
+ * [Bug 2612] restrict: Warn when 'monitor' can't be disabled because
+   of 'limited'.
  * [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.
  * [Bug 2804] install-local-data assumes GNU 'find' semantics.
  * [Bug 2808] GPSD_JSON driver enhancements, step 1.
    Various improvements, see http://bugs.ntp.org/2808 for details.