NTP 4.2.8 for build-522

Backport NTP updates from master.