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

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

bk: 54c4521etOFSkr-HUz72BLuvAOqclg

diff --cc ChangeLog
index cb0e33fad4720dff29b889dac47230b2e9db3371,55c2fcbe031f96a35d4f4683f51081e159fc6d0b..da4e458b744a646ce22c6706a960e6ff62fa5bdc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -3,8 -4,8 +4,9 @@@
  * Start the RC for 4.2.8p1.
  * [Bug 2187] Update version number generation scripts.
  * [Bug 2617] Fix sntp Usage documentation section.
 +* [Sec 2671] vallen in extension fields are not validated.
  * [Sec 2672] Code cleanup: On some OSes ::1 can be spoofed...
+ * [Bug 2736] Show error message if we cannot open the config file.
  * Copyright update.
  * Fix the package name.
  ---