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