Merge changes I169b52cf,Ieb0e4e24

* changes:
  init: Add test for gentle_kill
  init: Add gentle_kill service property