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

into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2776

bk: 553a0684rqxLDVKLEM4JqBHWSv4k1A

diff --cc ChangeLog
index e965c762dd3b10dee4e784809d1091174d010979,39d5c23af9c1282177a7ba5f66acf6fc3d2a8154..812752aab72e0cee569a9f6110bed20b2a613972
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,9 @@@
  ---
  
 +* [Bug 2776] Improve ntpq's 'help keytype'.
  * [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.