Restore a comment mangled in a sed run.
Rename test suite version of debug to match the header.
Revert "Let new debug() function add newlines, remove from all individual log messages."

This reverts commit ffaab5d453cbc5feb15a612439f10c4deb7c687d.
Use new debugNoNewline when we want fine grained log control.
Let log framework handle adding newlines, remove from individual calls.