Merge "Don't use $wgVariantArticlePath for variants of non-content languages"