Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/hart/ntp-stable-3799

into  ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/hart/ntp-stable-3801

bk: 640efb5ezG-XSMIfetHcBUODVe1djg

diff --cc ChangeLog
index 5c279695fed2b2e57fb0066e33846507d479b6c6,de7a037279a924388edd431a130ab57c7f47301e..29b4957c979cb515e6593590f33a9f6f21e0cc5d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,7 @@@
  ---
+ * [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 3799] Enable libopts noreturn compiler advice for MSC. <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.

diff --cc ports/winnt/vs2015/ntpd/ntpd.vcxproj
Simple merge

diff --cc ports/winnt/vs2015/ntpd/ntpd.vcxproj.filters
Simple merge