Comment 5 for bug 1192706

I linked a related branch that solves the problem for me, with test fixes. I get some other failures in the tests, but they seem unrelated (like needing a particular juju environments.yaml file).