Better control of stopping daemon before syncing time
remove debug
typo fix
Merge branch 'jag/ntp-daemon-fixes'

Conflicts:
	main/ntp/ChangeLog