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