fixes #7150 - stop elasticsearch before resetting data

Should we use service-wait here to be safe?