[r=jameinel] Merge 1.18 into trunk.
[r=jameinel] Merge 1.18 into trunk.

There were a bunch of conflicts from things that had to be backported but in a slightly different way. I verified that all the conflicts could be resolved in favor of current code.

There was one patch that wasn't in trunk at all, but according to the bug "didn't apply to trunk".
However, I think at least one of the assertions (bootstrap machine has its addresses set) does still apply, so I kept that bit.

axw/juju,jrwren/juju,wwitzel3/juju,mjs/juju,axw/juju,tych0/juju,tasdomas/juju,waigani/juju,dooferlad/juju,mjs/juju,mjs/juju,anastasiamac/juju,voidspace/juju,rogpeppe/juju,frankban/juju-tmp,Altoros/juju-cloudsigma,frankban/juju,perrito666/juju,bac/juju,dooferlad/juju,tych0/juju,bogdanteleaga/juju,ericsnowcurrently/juju,marcoceppi/juju,reedobrien/juju,perrito666/juju,makyo/juju,bac/juju,marcoceppi/juju,mjs/juju,mattyw/juju,cmars/juju,Altoros/juju-cloudsigma,bz2/juju,bogdanteleaga/juju,perrito666/juju,howbazaar/juju,macgreagoir/juju,tasdomas/juju,anastasiamac/juju,voidspace/juju,frankban/juju,sinzui/juju,bogdanteleaga/juju,frobware/juju,tsakas/juju,axw/juju,marcoceppi/juju,voidspace/juju,reedobrien/juju,wwitzel3/juju,perrito666/juju,dimitern/juju,mjs/juju,ericsnowcurrently/juju,tsakas/juju,thomnico/juju,dooferlad/juju,davecheney/juju,marcmolla/juju,cmars/juju,dooferlad/juju,jrwren/juju,frankban/juju-tmp,kat-co/juju,cloud-green/juju,tsakas/juju,fwereade/juju,frobware/juju,thomnico/juju,bac/juju,mattyw/juju,mikemccracken/juju,macgreagoir/juju,bz2/juju,mattyw/juju,AdamIsrael/juju,Altoros/juju-cloudsigma,cherylj/juju,waigani/juju,howbazaar/juju,bac/juju,dimitern/juju,reedobrien/juju,tasdomas/juju,mikemccracken/juju,gabriel-samfira/juju,Altoros/juju-vmware,AdamIsrael/juju,alesstimec/juju,fwereade/juju,mhilton/juju,marcmolla/juju,waigani/juju,howbazaar/juju,makyo/juju,tych0/juju,mhilton/juju,cloud-green/juju,mhilton/juju-juju,alesstimec/juju,mhilton/juju-juju,mhilton/juju,cloud-green/juju,kat-co/juju,rogpeppe/juju,dimitern/juju,alesstimec/juju,AdamIsrael/juju,dimitern/juju,mikemccracken/juju,sinzui/juju,mjs/juju,frobware/juju,marcmolla/juju,mhilton/juju-juju,alesstimec/juju,mhilton/juju-juju,rogpeppe/juju,wwitzel3/juju,davecheney/juju,tasdomas/juju,ericsnowcurrently/juju,mikemccracken/juju,reedobrien/juju,dimitern/juju,davecheney/juju,reedobrien/juju,bogdanteleaga/juju,anastasiamac/juju,dooferlad/juju,sinzui/juju,frankban/juju,cmars/juju,gabriel-samfira/juju,jrwren/juju,axw/juju,bz2/juju,wwitzel3/juju,AdamIsrael/juju,marcmolla/juju,cherylj/juju,howbazaar/juju,bz2/juju,macgreagoir/juju,Altoros/juju-vmware,bz2/juju,anastasiamac/juju,frankban/juju,tsakas/juju,macgreagoir/juju,kat-co/juju,voidspace/juju,macgreagoir/juju,kat-co/juju,fwereade/juju,bac/juju,sinzui/juju,cloud-green/juju,howbazaar/juju,alesstimec/juju,cherylj/juju,perrito666/juju,gabriel-samfira/juju,marcoceppi/juju,thomnico/juju,anastasiamac/juju,tych0/juju,Altoros/juju-cloudsigma,waigani/juju,frankban/juju-tmp,axw/juju,Altoros/juju-vmware,cherylj/juju,frankban/juju-tmp,gabriel-samfira/juju,fwereade/juju,ericsnowcurrently/juju,thomnico/juju,gabriel-samfira/juju,frankban/juju,ericsnowcurrently/juju,mhilton/juju,Altoros/juju-vmware,mjs/juju,marcmolla/juju,makyo/juju,mikemccracken/juju,cmars/juju,mattyw/juju,kat-co/juju,davecheney/juju,makyo/juju