Merge "Update DCAE-VES sonar job"