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

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

bk: 5a0ab038m_4sDDUGdLG8k4DmYecBEA

diff --cc ChangeLog
index 399f09a5879d895ab5b80d40d095fac60e6ada45,add12209e575fbbf7bddf2f6236e3a7444551cea..b1e84a899582ab938fe79629f59097f53b890a95
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -50,7 -47,7 +50,8 @@@
  * test_ntp_scanner_LDADD needs ntpd/ntp_io.o.  HStenn.
  * refclock_jjy.c: Add missing "%s" to an msyslog() call.  HStenn.
  * Build ntpq and libntpq.a with NTP_HARD_*FLAGS.  perlinger@ntp.org
 +* Fix trivial warnings from 'make check'. perlinger@ntp.org
+ * Fix bug in the override portion of the compiler hardening macro. HStenn.
  
  ---
  (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>