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: Idce1808cf4ea38487815cb217ebd5a693a57794a
Signed-off-by: Derek Higgins <derekh@redhat.com>
Merge "Stop ntpd before calling ntpdate" into folsom