Merge "Title: Simplify use of MWNamespace::getCanonicalName()"