Merge "Include run-test command in script failure output."