Issue #195: Merge comment-wrapper.tpl.php and comment.tpl.php.

PR for https://github.com/backdrop/backdrop-issues/issues/195