[patch] Rebase keyserver patch for disabled repos