I've got a PR up that forward-ports all of the required changes as well as the upgrade fix here: https://github.com/juju/juju/pull/2884
I've got a PR up that forward-ports all of the required changes as well as the upgrade fix here: https:/ /github. com/juju/ juju/pull/ 2884