Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2645

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-2645

bk: 5871d539XVQR-7D0mXCOVs069JvrHw

diff --cc ChangeLog
index 3ad4abffbd3f79f501fd960b8051cc591d312be8,b25e6592eba6276e8436e060e9d8ee882e87a957..29e7524b399d1666c34c33201fdbc542f142643b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,12 @@@
  ---
+ 
+ * [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
+   - fixed dependency inversion from [Bug 2837]
 +* [Bug 2645] out-of-bound pointers in ctl_putsys and decode_bitflags
 +  - Fixed these and some more locations of this pattern.
 +    Probably din't get them all, though. <perlinger@ntp.org>
+ * Update copyright year.
+ 
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>