Merge psp-at1.ntp.org:/home/stenn/ntp-stable-p5

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

bk: 568e074aUEXJyP1Fm1uQoqjKgqoDPg

diff --cc ChangeLog
index 14574f2673dbca3bcb6ee653bae969a560d68a3f,586196c200f8c6c3766535b3d1db89e3bf58379f..1d07af5275de79040ec7769fca30b623c3c5d828
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -56,7 -53,9 +56,8 @@@
  * Header cleanup in tests/libntp/sfptostr.c.  Harlan Stenn.
  * Quiet a warning from clang.  Harlan Stenn.
  * Update the NEWS file.  Harlan Stenn.
+ * Update scripts/calc_tickadj/Makefile.am.  Harlan Stenn.
  ---
 -(4.2.8p4) 2015/10/21 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.8p4-RC1) 2015/10/06 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Sec 2899] CVE-2014-9297  perlinger@ntp.org