Stop ntpd before calling ntpdate

https://bugzilla.redhat.com/show_bug.cgi?id=906254
https://bugzilla.redhat.com/show_bug.cgi?id=905842

Change-Id: If6dae4a7c82db2dda282f8dfb59b5889451d416f
Signed-off-by: Derek Higgins <derekh@redhat.com>
Merge "Stop ntpd before calling ntpdate"