Comment 4 for bug 1415596

Have a local clock and orphan mode together is a bad idea, cause it can lead to unpredicted behavior. In ntp should be used only local clock or orphan mode, so revert is a straightforward, but not good thought.

Moreover, problem in that exact environment is not in ntp at all:

AssertionError: Failed to execute "NTPD=$(find /etc/init.d/ -regex '/etc/init.d/\(ntp.?\|ntp-dev\)'); $NTPD stop; killall ntpd; ntpd -qg && $NTPD start" on remote host: ['ntpd: no process killed\n']

we find ntpd init script, then we stop ntpd with it. Then, I suppose, it stopped a long time and we trying kill it manually. But in that case, "$NTPD stop" actually stopped ntpd, then we try "killall ntpd" and it return 1 to us, cause ntpd was stopped already. Then next commands wasn't executed at all, cause script already stopped with error from killall.

We should just do "killall ntpd || true" instead just "killall ntpd".