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

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

bk: 586cd553nGntZ25P2IL5e1OAdd-7WQ

diff --cc ChangeLog
index c3aff26f911bf6494af0c47db84fbcf1ce397323,b62b33799f5b043ef0d7932273d2a0a5cb698980..b25e6592eba6276e8436e060e9d8ee882e87a957
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
  ---
++
+ * [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
+   - fixed dependency inversion from [Bug 2837]
 +* Update copyright year.
  
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>