Merge "Fix RevisionStorageTest with non-wikitext NS_MAIN"