Merge "In CLI tests set merge_stderr to False by default"