Merge "CSIT fix vnfsdk"