Imrpove PHPUnit bootstrap
Merge branch 'master' of ssh://review/mediawiki/extensions/Maps