Merge deacon.udel.edu:/deacon/backroom/ntp-stable

into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 554d770fVC9lj0DDFmeCsaj6sE7suw

diff --cc ChangeLog
index fe2c2234334ea1e2b90df0f80d43d55b83ffb82b,f22c179c9fa20b432642e10ec07637a49402f4e5..4866cecc212bcbc2f33fed6a8d91628a9ce3ab71
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -198,9 -16,9 +198,10 @@@ ntp-4.3 begins
  * [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.