Merge "Fix vnfsdk/ice sonar"