Merge "Immediately drop wgValidateAllHtml and related code"