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

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

bk: 55bc8925ebllCnnf-X2wDwqoejd_fQ

diff --cc ChangeLog
index e33fbd4e2a5d472330f5e32e0181704b994de766,d64e505a44859504afefd83d4839fa30a7dd3add..8393ccf66f6d863a35ae8ca7aaa4119d4825ba7d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,6 -2,6 +2,7 @@@
  * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
  * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
  * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.
++* [Bug 2821] minor build issues: fixed refclock_gpsdjson.c.  perlinger@ntp.org
  * [Bug 2823] ntpsweep with recursive peers option doesn't work.  H.Stenn.
  * [Bug 2849] Systems with more than one default route may never
    synchronize.  Brian Utterback.  Note that this patch might need to