am ff5be396: Merge changes from topic \'init-rc-breakup\'

* commit 'ff5be396d77cdf7f18e7d8f7a14f62ec760f5a1e':
  init: Queue Triggers instead of Actions
  bundle init.rc contents with its service