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: 554d8ca31YSDJHhQlnfOB9vbbH61xw

diff --cc ChangeLog
index 99aa5bd17cab8319186759ac13e9c3389dd31138,21a86196d4efad32e2c2cc3466ff201dd62e6fe8..ac1082d57fa3a458d914abb78886cc982afe278a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -19,12 -13,9 +19,13 @@@
  * [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.
 +  Fix crash during cleanup if GPS device not present and char device.
 +  Increase internal token buffer to parse all JSON data, even SKY.
 +  Defer logging of errors during driver init until the first unit is
 +  started, so the syslog is not cluttered when the driver is not used.
    Various improvements, see http://bugs.ntp.org/2808 for details.
    Changed libjsmn to a more recent version.
  * [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX.