Merge "Update NSBPerf CLI to adapt to new output format"