Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1
automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null