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

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

bk: 55410f1aF8fwV-iupOl85vzdIssa0Q

diff --cc ChangeLog
index 6ddd568034f1afdd3b78947058b757fa22a1827b,5ddb578ed81b121af248a68d3dae13c04beafc5d..5efed602e5bcb4a60fe0e1590f3c8e5d5da36f8d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,8 +1,11 @@@
  ---
  
- * [Bug 2808] GPSD_JSON driver enhancements, step 1.
 +* [Bug 2808] GPSD_JSON driver enhancements, step 1
 +  fix coverity issues with refclock_gpsdjson and refclock_shm
 +  Add a few more tallies as per Hal Murray's suggestions
+ * 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.

diff --cc ntpd/refclock_shm.c
Simple merge