Merge "support vnf product_name"