Merge branch 'corbaname_parse_diagnostics' into perf_helper_lookup