fix: resolve Copybara build regressions in S-Core#10

Chahult wants to merge 2 commits into

eclipse-score:maineclipse-score/config_management:mainfrom

Chahult:mainChahult/config_management:mainCopy head branch name to clipboard