Merge "Add sonar job to nonrtric"