Improve ContainsSubstrings matcher

If there is more than one line in the actual we should print it
with multiple lines
Pretty print JSON for 'cf curl'

[Finishes #71425006]