Merge "Sonar fix in ecomp-portal-BE-common"