am bf687484: am 0259c010: am 596e409e: Merge "Work on issue #11634365: Leaking restarting services" into klp-dev

* commit 'bf687484573ef63c5b54adfc0325a41115fb49fa':
  Work on issue #11634365: Leaking restarting services