fix error in log checking: add "total_records" shortcut to the response object for collection types
add initial error class for git merge issues; also fetch deployment task logs and put them in the sink
poll for deployment log messages as well as system/scripting, and analyze them for errors as we do scripting logs (which required some log item normalization as well as rejiggering of status and failure recognition); fix failures to subclass base