Merge "Fix the cmso sonar jenkins job"