Merge "[patch] Rebase keyserver proxy support" into stable/fraser