Merge "xci: Log functest output before failure"