Merge "Make sure cli CommandFailed prints out stdout and stderr"