Merge "enhace the ns instance query to support pnfinfo"