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: 558b8e96Hrl2Zb2PY1rJ3NiCjwBQ2g

diff --cc ChangeLog
index e04a363801eeca50b79061efa8abb30e484bd362,21876d6777500c17f37c7c910b8b9fe4293bdf3e..d347214391c62cfa6a7eb3e0537bf78dfcce8c7e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,8 @@@
  ---
- 
+ 
 +* [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.
  ---
  (4.2.8p3-RC2) 2015/06/24 Released by Harlan Stenn <stenn@ntp.org>