apply go-add-control-package changes onto fresh branch
apply go-add-control-package changes onto fresh branch
ericsnowcurrently/juju-charm,wwitzel3/charm,wwitzel3/juju-charm,wwitzel3/charm,wwitzel3/juju-charm,ericsnowcurrently/juju-charm,makyo/charm,wwitzel3/juju-charm,makyo/charm,ericsnowcurrently/juju-charm,rogpeppe/charm,wwitzel3/charm,makyo/charm