Avoid ntp conflicting with chrony
Merge branch 'ntp'