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

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2951

bk: 57dbae60bx1DJHkB1RLwuoKp9-m4Xg

diff --cc ChangeLog
index 9f35c57afc780229afffed364c105ed190b38f18,4810c9bab43dbc87a785434d3abb84f5c424607e..5cb3ccfb0b39d2d9b86da6cea40975c405140c21
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
  ---
+ * [Bug 2951] ntpd tests fail: multiple definition of `send_via_ntp_signd'
+   - fixed Makefile.am <perlinger@ntp.org>
+ 
++---
 +
 +* [Bug 3053] ntp_loopfilter.c frequency calc precedence error.  Sarah White.
 +* git author attribution cleanup
 +* bk ignore file cleanup
 +
  ---
  (4.2.8p8) 2016/06/02 Released by Harlan Stenn <stenn@ntp.org>