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