Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"