Merge change 7315

* changes:
  Allow an onrestart command to stop the current service