Merge

bk: 3dec40e0tpX3MIonTP-TaEL_NlqxMw

diff --cc include/ntp_config.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge

diff --cc ntpd/ntp_request.c
Simple merge

diff --cc ntpd/refclock_palisade.c
Simple merge