Merge "Fix sonar issues in dcaegen2-analytics-tca"