Merge "init: allow customizable restart and timeout periods for services"