Merge bk://www.ntp.org/ntp-dev

into  pogo.udel.edu:/pogo/users/kamboj/new-config-bk-repo

bk: 462680ceOfM3TcGUlvFmD0xNBCeEHQ

diff --cc ntpd/cmd_args.c
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_io.c
Simple merge

diff --cc ntpd/ntpd.c
Simple merge

diff --cc ntpq/ntpq-subs.c
Simple merge

diff --cc ntpq/ntpq.c
Simple merge