Fix handling of renewing cert w/o SAN. Fixes #11652
(cherry picked from commit 09d3fe621a56292817a85a54916e8b99e2b26c00)
Fix handling of renewing cert w/o SAN. Fixes #11652
(cherry picked from commit 09d3fe621a56292817a85a54916e8b99e2b26c00)