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

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

bk: 553e78207yeV4vH3z6LBuwKj6HseBQ

diff --cc ChangeLog
index 1a6ac4fb6ed52e9601f27a7ac5ad98e4250650b3,cb5e12ab11d29a6340887dd9620a6c6abcd71400..51766ae9831be2ed840336df0b7edd930a9a1369
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -11,8 -9,8 +11,9 @@@
    Various improvements, see http://bugs.ntp.org/2808 for details.
    Changed libjsmn to a more recent version.
  * [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h.
+ * [Bug 2815] net-snmp before v5.4 has circular library dependencies.
  * Improve the ntpq documentation around the controlkey keyid.
 +* ntpq.c cleanup.
  * autogen-5.18.5
  ---
  (4.2.8p2) 2015/04/07 Released by Harlan Stenn <stenn@ntp.org>