Merge change 22400 into eclair

* changes:
  Add more control over a service's start state.