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

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

bk: 55495b1b4ou3BVwlvAR31wMMvKLHKA

diff --cc ChangeLog
index 3e8634fdc332d0ed53af3537ca54ec860166ea4e,bab8c456677b131c3cf9a0efdd07f3e801928d99..21a86196d4efad32e2c2cc3466ff201dd62e6fe8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -13,7 -7,7 +13,8 @@@
  * [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 2805] ntpd fails to join multicast group.
 +* [Bug 2806] refclock_jjy.c supports the Telephone JJY.
  * [Bug 2808] GPSD_JSON driver enhancements, step 1.
    Various improvements, see http://bugs.ntp.org/2808 for details.
    Changed libjsmn to a more recent version.