Merge branch 'environ-resource-catalogs' of https://github.com/wallyworld/juju into environ-resource-catalogs