Merge proposals dependent on lp:~johnsca/charms/trusty/cf-nats/refactor

lp:~johnsca/charms/trusty/cf-nats/refactor has no merge proposals.