ntp: import ntp-4.2.8p17Fixes two small bugs including one regression.MFC after: 3 daysMerge commit 'ab1f1aa8333369a83ff284848fc3fc2e52d5f29f'