Merge tl.davehart.net:C:/ntp/stable/3800

into  tl.davehart.net:C:/ntp/stable/3801

bk: 640ee564LIZj6IKUx9K11JLFFZy7gA

diff --cc ChangeLog
index 4843f182a050113d113032203055f914c7da4bea,36ef99eef76078492f129b718a25c9cbdf0b7804..de7a037279a924388edd431a130ab57c7f47301e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,6 @@@
  ---
+ * [Bug 3801] gpsdjson refclock gps_open() device name mishandled. <hart@ntp.org>
 +* [Bug 3800] libopts-42.1.17 does not compile with Microsoft C. <hart@ntp.org>
  * [Bug 3797] Windows getaddrinfo w/AI_ADDRCONFIG fails for localhost when 
               disconnected, breaking ntpq and ntpdc. <hart@ntp.org>
  * [Bug 3795] pollskewlist documentation uses | when it shouldn't.