Ported fix #1425435 from 1.22 to master
Ported fix #1425435 from 1.22 to master

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