Merge "Adding nfvi flag to enable data collection"