Merge "Force CommentMigration MIGRATION_OLD in 2 RevisionTest tests"