Fix merge conflicts between #486 and #510 (pip install .).
Fix merge conflicts between #486 and #510 (pip install .).

armersong/letsencrypt,deserted/letsencrypt,Bachmann1234/letsencrypt,BKreisel/letsencrypt,twstrike/le_for_patching,TheBoegl/letsencrypt,ahojjati/letsencrypt,piru/letsencrypt,rutsky/letsencrypt,fmarier/letsencrypt,jmhodges/letsencrypt,ruo91/letsencrypt,jtl999/certbot,vcavallo/letsencrypt,fmarier/letsencrypt,tyagi-prashant/letsencrypt,hsduk/lets-encrypt-preview,lmcro/letsencrypt,rugk/letsencrypt,solidgoldbomb/letsencrypt,BillKeenan/lets-encrypt-preview,Sveder/letsencrypt,stewnorriss/letsencrypt,Jonadabe/letsencrypt,mrb/letsencrypt,martindale/letsencrypt,martindale/letsencrypt,rugk/letsencrypt,bestwpw/letsencrypt,lbeltrame/letsencrypt,bsmr-misc-forks/letsencrypt,VladimirTyrin/letsencrypt,hlieberman/letsencrypt,xgin/letsencrypt,ahojjati/letsencrypt,DavidGarciaCat/letsencrypt,rlustin/letsencrypt,twstrike/le_for_patching,lbeltrame/letsencrypt,bestwpw/letsencrypt,ghyde/letsencrypt,beermix/letsencrypt,tdfischer/lets-encrypt-preview,kevinlondon/letsencrypt,deserted/letsencrypt,Hasimir/letsencrypt,mitnk/letsencrypt,stewnorriss/letsencrypt,piru/letsencrypt,PeterMosmans/letsencrypt,dietsche/letsencrypt,brentdax/letsencrypt,xgin/letsencrypt,ruo91/letsencrypt,stweil/letsencrypt,thanatos/lets-encrypt-preview,Hasimir/letsencrypt,armersong/letsencrypt,solidgoldbomb/letsencrypt,PeterMosmans/letsencrypt,jtl999/certbot,riseofthetigers/letsencrypt,luorenjin/letsencrypt,Jadaw1n/letsencrypt,hlieberman/letsencrypt,letsencrypt/letsencrypt,rutsky/letsencrypt,jmaurice/letsencrypt,riseofthetigers/letsencrypt,kevinlondon/letsencrypt,thanatos/lets-encrypt-preview,Jonadabe/letsencrypt,hsduk/lets-encrypt-preview,skynet/letsencrypt,modulexcite/letsencrypt,BKreisel/letsencrypt,BillKeenan/lets-encrypt-preview,bsmr-misc-forks/letsencrypt,sapics/letsencrypt,rlustin/letsencrypt,sapics/letsencrypt,skynet/letsencrypt,jsha/letsencrypt,brentdax/letsencrypt,beermix/letsencrypt,Bachmann1234/letsencrypt,g1franc/lets-encrypt-preview,sjerdo/letsencrypt,wteiken/letsencrypt,TheBoegl/letsencrypt,mitnk/letsencrypt,kuba/letsencrypt,modulexcite/letsencrypt,g1franc/lets-encrypt-preview,tdfischer/lets-encrypt-preview,jsha/letsencrypt,sjerdo/letsencrypt,jmhodges/letsencrypt,mrb/letsencrypt,Sveder/letsencrypt,digideskio/lets-encrypt-preview,wteiken/letsencrypt,jmaurice/letsencrypt,VladimirTyrin/letsencrypt,tyagi-prashant/letsencrypt,vcavallo/letsencrypt,goofwear/letsencrypt,ghyde/letsencrypt,dietsche/letsencrypt,goofwear/letsencrypt,lmcro/letsencrypt,Jadaw1n/letsencrypt,kuba/letsencrypt,luorenjin/letsencrypt,letsencrypt/letsencrypt,digideskio/lets-encrypt-preview,DavidGarciaCat/letsencrypt,stweil/letsencrypt