Backport fix for execvp issue from trunk