Merge "General sonar fixes: use logger"

No match.