Fix bad merge
Fix bad merge

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