Merge proposals dependent on lp://qastaging/~hopem/charms/trusty/neutron-api/make-ml2-configurable

lp://qastaging/~hopem/charms/trusty/neutron-api/make-ml2-configurable has no merge proposals.