Merge "check ntpserver as empty string instead of null"