Merge "fix testEditCount to work with non-wikitext content in main NS"