[backfire/packages] ntpd: merge r28572