MDL-41720 code checker error clean ups for wikimedia stuff