Merge "Make database classes handle hyphens in $wgDBname"