Address review comments
Address review comments

stweil/letsencrypt,bsmr-misc-forks/letsencrypt,lmcro/letsencrypt,jsha/letsencrypt,jtl999/certbot,letsencrypt/letsencrypt,jtl999/certbot,letsencrypt/letsencrypt,bsmr-misc-forks/letsencrypt,jsha/letsencrypt,stweil/letsencrypt,lmcro/letsencrypt