Only merge STDERR when there are multiple lines

Otherwise, our multi-line concatenation logic will fail.

This is reasonable because we're only interested in STDERR output when
it represents Thrift error messages, which are always at least two lines
long. All other cases appear to be process-level error output, and that
will never match the regular expression pattern below.