Merge "Do not block SIGTERM in init's child processes"