Merge ntp-testbuild.tal1.ntfo.org:/home/nfs1.chi1/hart/ntp-stable-3856

into  ntp-testbuild.tal1.ntfo.org:/home/nfs1.tal1/harlan/ntp/ntp-stable-3856

bk: 64e48b37eXJTrapfWxVR_fT9a3_TeA

diff --cc ChangeLog
index 3c6059e791a7323e4915322544d423cd25063d7a,227ba620f75d3576a6095c7e68d40a0f2465bd6b..aa7444bda81a54e8b9063c2ba0f1f87c4bb8f3d3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,10 @@@
  ---
  
+ * [Bug 3856] Enable Edit & Continue debugging with Visual Studio.
+              <hart@ntp.org>
 +* [Bug 3853] Clean up warnings with modern compilers. <hart@ntp.org>
 +* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as
 +             intended. <hart@ntp.org>
  * [Bug 3851] Drop pool server when no local address can reach it.
               <hart@ntp.org>
  * [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid.