Merge changes I5e259fdd,I5b9ab456 into main

* changes:
  init: Make WaitToBeReaped() wait less long
  init: Create different file descriptors for SIGCHLD and SIGTERM