* UploadPackTest: Fix name hiding introduced by If72b4b422 * Suppress non-localized string warnings introduced by If72b4b422