Merge "Fix sonar job configuration for vnfsdk/ice"