Merge "Mock CommentStore in some RevisionTest tests"