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

* commit '2e3ede74978d14f7bd853c3228864280d99a438e':
  Maybe fix issue #11634365: Leaking restarting services