Fixes #6754,BZ1122650 - Adds YAML and JSON output adapters