Fix some merge bugs
Fix some merge bugs

TheBoegl/letsencrypt,wteiken/letsencrypt,jsha/letsencrypt,TheBoegl/letsencrypt,stweil/letsencrypt,brentdax/letsencrypt,jtl999/certbot,dietsche/letsencrypt,lmcro/letsencrypt,mitnk/letsencrypt,bsmr-misc-forks/letsencrypt,DavidGarciaCat/letsencrypt,brentdax/letsencrypt,DavidGarciaCat/letsencrypt,stweil/letsencrypt,lmcro/letsencrypt,mitnk/letsencrypt,letsencrypt/letsencrypt,thanatos/lets-encrypt-preview,dietsche/letsencrypt,wteiken/letsencrypt,jsha/letsencrypt,jtl999/certbot,bsmr-misc-forks/letsencrypt,letsencrypt/letsencrypt,thanatos/lets-encrypt-preview