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

into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2853

bk: 558e57b7p_IeFOh6Rqp9bg4eyLkzpw

diff --cc ChangeLog
index d347214391c62cfa6a7eb3e0537bf78dfcce8c7e,9e85ea92fc2362956b9df52b3cef2664c003569d..1e285195713e5c0e517cda2e17f7695929121859
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,30 +1,32 @@@
  ---
  
 +* [Sec 2853] FICORA #829967.  Juergen Perlinger, Harlan Stenn.
 +* [Sec 2853] Initial work on tests/sec-2853/.  Harlan Stenn.
  * [Bug 2855] Parser fix for conditional leap smear code.  Harlan Stenn.
+ * [Bug 2855] Report leap smear in the REFID.  Harlan Stenn.
+ * [Bug 2856] ntpd should wait() on terminated child processes.  Paul Green.
+ * [Bug 2857] Stratus VOS does not support SIGIO.  Paul Green.
+ * refidsmear test cleanup.  Tomasz Flendrich.
+ * refidsmear function support and tests.  Harlan Stenn.
+ * sntp/tests/Makefile.am: remove g_nameresolution.cpp as it tested
+   something that was only in the 4.2.6 sntp.  Harlan Stenn.
+ * Modified tests/bug-2803/Makefile.am so it builds Unity framework tests.
+   Damir Tomić
+ * Modified tests/libtnp/Makefile.am so it builds Unity framework tests.
+   Damir Tomić
+ * Modified sntp/tests/Makefile.am so it builds Unity framework tests.
+   Damir Tomić
+ * tests/sandbox/smeartest.c: Harlan Stenn, Damir Tomic, Juergen Perlinger.
+ * Converted from gtest to Unity: tests/bug-2803/. Damir Tomić
+ * Converted from gtest to Unity: tests/libntp/ a_md5encrypt, atoint.c,
+   atouint.c, authkeys.c, buftvtots.c, calendar.c, caljulian.c,
+   calyearstart.c, clocktime.c, hextoint.c, lfpfunc.c, modetoa.c,
+   numtoa.c, numtohost.c, refnumtoa.c, ssl_init.c, statestr.c,
+   timespecops.c, timevalops.c, uglydate.c, vi64ops.c, ymd2yd.c.
+   Damir Tomić
+ * Converted from gtest to Unity: sntp/tests/ kodDatabase.c, kodFile.c,
+   networking.c, keyFile.c, utilities.cpp, sntptest.h,
+   fileHandlingTest.h. Damir Tomić
  ---
  (4.2.8p3-RC2) 2015/06/24 Released by Harlan Stenn <stenn@ntp.org>
  

diff --cc configure.ac
Simple merge