distinguish capture_output from buffer_output

allow capturing output without silencing it,
which is useful for slimerjs,
which requires looking at output to determine failure.
Merge pull request #6860 from minrk/slimerjs

distinguish capture_output from buffer_output