Merge "Fix Sonar Jenkins job"