convert to use wikitools
fix issue where dbname has _ and interwiki prefix uses -
Merge remote-tracking branch 'upstream/master'