Issue #2272467 by ParisLiakos: Remove usages of watchdog() from procedural code.
Issue #2111357 by marcingy, andypost: Get rid of comment_count_unpublished() in favor of CommentStorage method.