Merge pull request #3285 from nrwahl2/nrwahl2-cts2
Test: cts-cli: Use only the first line of cmd in output