Merge "firewall: periodically re-resolve NTP servers"