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