Merge "sonar fix: Rsrc handling nokia/CommonUtil"