Issue #2031901 by andypost: Remove node tokens from comment.tokens.inc.
Issue #2372477 by yched: Fixed Lots of tests still enable entity.module.