Lots of updates to make safe_yaml work right.
Fix Solr task, no reason to scan the output.