Merge "logwrap_fork_execvp block recovery auto reboot"