Merge "Switching ntp class to use new format for ntp servers definition"