Improve certificate upload warning
(cherry picked from commit 70b800a565a56333b8bde6643cf5f5b22ab231f4) GnuPG-Bug-ID: 6769