Merge "Improve error reporting in ConnDiags tests"