Merge ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-p16

into  ntp-devbuild.chi1.ntfo.org:/home/nfs1.chi1/stenn/ntp-stable-p16-sec

bk: 643f9db92rTMq-ncaY9h_8QmW9z2Yg

diff --cc ChangeLog
index 16486f683bf8b03e0e3f038df4e84a814cf7fed8,6a333b89beaba40fdc1a125157c52cc8f99ac65e..93eef5adb1fc90521a7c28ba8e8be15285b0571c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -79,11 -75,8 +79,13 @@@
               Integrated patch from Brian Utterback. <hart@ntp.org>
  * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
  * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
 +* Use correct rounding in mstolfp(). perlinger/hart
 +* M_ADDF should use u_int32.  <hart@ntp.org>
 +* Only define tv_fmt_libbuf() if we will use it. <stenn@ntp.org>
 +* Use recv_buffer instead of the longer recv_space.X_recv_buffer. hart/stenn
 +* Disable "embedded NUL in string" warnings in libopts, when we can. <stenn@>
+ * Rename a poorly-named variable.  <stenn@ntp.org>
+ * Disable "embedded NUL in string" messages in libopts, when we can. <stenn@>
  * Use https in the AC_INIT URLs in configure.ac.  <stenn@ntp.org>
  * Implement NTP_FUNC_REALPATH.  <stenn@ntp.org>
  * Lose a gmake construct in ntpd/Makefile.am.  <stenn@ntp.org>