merge 057-upgrader-delay-stop
merge 057-upgrader-delay-stop

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