stop/restart shouldn't fail if service isn't already running
Merge remote-tracking branch 'cmer/fix_stop_restart' into integration