am 8e9b5fc9: am 59bf3be7: am 2e3ede74: Merge "Maybe fix issue #11634365: Leaking restarting services" into klp-dev

* commit '8e9b5fc93278084487fd98726c6e20333d675c40':
  Maybe fix issue #11634365: Leaking restarting services