Merge pull request #8984 from mlichvar/chrony-update-3.5