Merge proposals dependent on lp://qastaging/~james-page/charms/trusty/neutron-gateway/lp1531102

lp://qastaging/~james-page/charms/trusty/neutron-gateway/lp1531102 has no merge proposals.