Merge "Fix VNF instantiate problem"