Merge "Rename various $wikiId fields/parameters to $dbDomain in user classes"